Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-template: Make sure that template-dummy is set and used properly.

Browse Source
This commit is contained in:
WillyPillow 2020-08-25 01:43:11 +08:00
parent 55a3982bf6
commit e9e198cc10
No known key found for this signature in database
GPG Key ID: 3839E194B1415A9C
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubesadmin/tools/qvm_template.py
View File

@ -1231,11 +1231,13 @@ def remove(
orig_dummy = dummy orig_dummy = dummy
cnt = 1 cnt = 1
while dummy in app.domains \ while dummy in app.domains \
and not app.domains[dummy].features.get('template-dummy', 0): and app.domains[dummy].features.get(
'template-dummy', '0') == '0':
dummy = '%s-%d' % (orig_dummy, cnt) dummy = '%s-%d' % (orig_dummy, cnt)
cnt += 1 cnt += 1
if dummy not in app.domains: if dummy not in app.domains:
dummy_vm = app.add_new_vm('TemplateVM', dummy, 'red') dummy_vm = app.add_new_vm('TemplateVM', dummy, 'red')
dummy_vm.features['template-dummy'] = 1
else: else:
dummy_vm = app.domains[dummy] dummy_vm = app.domains[dummy]