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

dom0/backup-restore: support for restore of HVM

Browse Source
This commit is contained in:
Marek Marczykowski 2012-04-20 00:11:06 +02:00
parent 85609a764f
commit 13d1080eb0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -885,8 +885,7 @@ def backup_restore_print_summary(restore_info, print_callback = print_stdout):
+ ('}' if vm.is_netvm() else '')"}, + ('}' if vm.is_netvm() else '')"},
"type": {"func": "'Tpl' if vm.is_template() else \ "type": {"func": "'Tpl' if vm.is_template() else \
('Proxy' if vm.is_proxyvm() else \ vm.type.replace('VM','')"},
(' Net' if vm.is_netvm() else 'App'))"},
"updbl" : {"func": "'Yes' if vm.updateable else ''"}, "updbl" : {"func": "'Yes' if vm.updateable else ''"},
@ -1135,10 +1134,14 @@ def backup_restore_do(backup_dir, restore_info, host_collection = None, print_ca
new_vm = None new_vm = None
try: try:
restore_vm_dir (backup_dir, vm.dir_path, qubes_appvms_dir); restore_vm_dir (backup_dir, vm.dir_path, qubes_appvms_dir);
new_vm = host_collection.add_new_appvm(vm.name, template, if vm.type == "HVM":
conf_file=vm.conf_file, new_vm = host_collection.add_new_hvm(vm.name,
dir_path=vm.dir_path, label=vm.label)
label=vm.label) else:
new_vm = host_collection.add_new_appvm(vm.name, template,
conf_file=vm.conf_file,
dir_path=vm.dir_path,
label=vm.label)
except Exception as err: except Exception as err:
error_callback("ERROR: {0}".format(err)) error_callback("ERROR: {0}".format(err))
error_callback("*** Skiping VM: {0}".format(vm.name)) error_callback("*** Skiping VM: {0}".format(vm.name))