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

restory.py: restore template_for_dispvms property early

Browse Source
This commit is contained in:
Rusty Bird 2018-02-24 12:27:39 +00:00
parent c86b731d3e
commit ab65338cfb
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubesadmin/backup/restore.py
View File

@ -1883,6 +1883,12 @@ class BackupRestore(object):
del self.app.domains[new_vm.name] del self.app.domains[new_vm.name]
continue continue
# restore this property early to be ready for dependent DispVMs
prop = 'template_for_dispvms'
value = vm.properties.get(prop, None)
if value is not None:
self._restore_property(new_vm, prop, value)
restore_info[vm.name].restored_vm = new_vm restore_info[vm.name].restored_vm = new_vm
for vm in vms.values(): for vm in vms.values():
@ -1895,7 +1901,8 @@ class BackupRestore(object):
continue continue
for prop, value in vm.properties.items(): for prop, value in vm.properties.items():
if prop == 'dispid': # can't reset the first; already handled the second
if prop in ['dispid', 'template_for_dispvms']:
continue continue
# exclude VM references - handled manually according to # exclude VM references - handled manually according to
# restore options # restore options