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

dom0/backup-restore: restore all attributes

Browse Source
This commit is contained in:
Marek Marczykowski 2012-04-20 02:52:05 +02:00
parent 0654a41c6a
commit 27b5aac7ad
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dom0/qvm-core/qubesutils.py
View File

@ -834,6 +834,12 @@ def backup_restore_prepare(backup_dir, options = {}, host_collection = None):
else: else:
netvm_name = vm.netvm.name netvm_name = vm.netvm.name
vms_to_restore[vm.name]['netvm'] = netvm_name vms_to_restore[vm.name]['netvm'] = netvm_name
# Set to None to not confuse QubesVm object from backup
# collection with host collection (further in clone_attrs). Set
# directly _netvm to suppress setter action, especially
# modifying firewall
vm._netvm = None
netvm_on_host = host_collection.get_vm_by_name (netvm_name) netvm_on_host = host_collection.get_vm_by_name (netvm_name)
# No netvm on the host? # No netvm on the host?
@ -1036,6 +1042,12 @@ def backup_restore_do(backup_dir, restore_info, host_collection = None, print_ca
host_collection.pop(new_vm.qid) host_collection.pop(new_vm.qid)
continue continue
try:
new_vm.clone_attrs(vm)
except Exception as err:
error_callback("ERROR: {0}".format(err))
error_callback("*** Some VM property will not be restored")
try: try:
new_vm.create_appmenus(verbose=True) new_vm.create_appmenus(verbose=True)
except Exception as err: except Exception as err:
@ -1095,6 +1107,12 @@ def backup_restore_do(backup_dir, restore_info, host_collection = None, print_ca
new_vm.uses_default_netvm = False new_vm.uses_default_netvm = False
new_vm.netvm = netvm new_vm.netvm = netvm
try:
new_vm.clone_attrs(vm)
except Exception as err:
error_callback("ERROR: {0}".format(err))
error_callback("*** Some VM property will not be restored")
try: try:
new_vm.verify_files() new_vm.verify_files()
except Exception as err: except Exception as err:
@ -1153,6 +1171,12 @@ def backup_restore_do(backup_dir, restore_info, host_collection = None, print_ca
new_vm.uses_default_netvm = False new_vm.uses_default_netvm = False
new_vm.netvm = netvm new_vm.netvm = netvm
try:
new_vm.clone_attrs(vm)
except Exception as err:
error_callback("ERROR: {0}".format(err))
error_callback("*** Some VM property will not be restored")
try: try:
new_vm.create_appmenus(verbose=True) new_vm.create_appmenus(verbose=True)
except Exception as err: except Exception as err: