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

Catch more exceptions during VM restore (#212)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-04-20 20:05:58 +02:00
parent 3f28f16336
commit 832289c53e
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dom0/qvm-tools/qvm-backup-restore
View File

@ -318,18 +318,19 @@ def main():
for vm in [ vm for vm in vms_to_restore if vm.is_template()]: for vm in [ vm for vm in vms_to_restore if vm.is_template()]:
print "-> Adding Template VM {0}...".format(vm.name) print "-> Adding Template VM {0}...".format(vm.name)
updateable = vm.updateable updateable = vm.updateable
vm = host_collection.add_new_templatevm(vm.name, try:
vm = host_collection.add_new_templatevm(vm.name,
conf_file=vm.conf_file, conf_file=vm.conf_file,
dir_path=vm.dir_path, dir_path=vm.dir_path,
installed_by_rpm=False) installed_by_rpm=False)
vm.updateable = updateable vm.updateable = updateable
try:
vm.verify_files() vm.verify_files()
except QubesException as err: except Exception as err:
print "ERROR: {0}".format(err) print "ERROR: {0}".format(err)
print "*** Skiping VM: {0}".vm.name print "*** Skiping VM: {0}".vm.name
host_collection.pop(vm.qid) if vm:
host_collection.pop(vm.qid)
continue continue
try: try:
@ -361,34 +362,50 @@ def main():
updateable = vm.updateable updateable = vm.updateable
vm = host_collection.add_new_appvm(vm.name, template_vm, try:
vm = host_collection.add_new_appvm(vm.name, template_vm,
conf_file=vm.conf_file, conf_file=vm.conf_file,
dir_path=vm.dir_path, dir_path=vm.dir_path,
updateable=updateable, updateable=updateable,
label=vm.label) label=vm.label)
except Exception as err:
print "ERROR: {0}".format(err)
print "*** Skiping VM: {0}".format(vm.name)
if vm:
host_collection.pop(vm.qid)
continue
if not uses_default_netvm: if not uses_default_netvm:
vm.uses_default_netvm = False vm.uses_default_netvm = False
vm.netvm_vm = netvm_vm vm.netvm_vm = netvm_vm
if template_vm is not None and recreate_conf: try:
print "--> Recreating config file..." if template_vm is not None and recreate_conf:
vm.create_config_file() print "--> Recreating config file..."
vm.create_config_file()
except QubesException as err:
print "ERROR xen config restore: {0}".format(err)
print "*** VM '{0}' will not boot until you manually fix it (or correctly restore this VM)!".format(vm.name)
try:
vm.create_appmenus(verbose=True)
except QubesException as err:
print "ERROR during appmenu restore: {0}".format(err)
print "*** VM '{0}' will not have appmenus".format(vm.name)
vm.create_appmenus(verbose=True)
try: try:
vm.verify_files() vm.verify_files()
except QubesException as err: except QubesException as err:
print "ERROR: {0}".format(err) print "ERROR: {0}".format(err)
print "*** Skiping VM: {0}".format(vm.name) print "*** Skiping VM: {0}".format(vm.name)
host_collection.pop(vm.qid) host_collection.pop(vm.qid)
continue
try: try:
vm.add_to_xen_storage() vm.add_to_xen_storage()
except (IOError, OSError) as err: except (IOError, OSError) as err:
print "ERROR: {0}".format(err) print "ERROR: {0}".format(err)
print "*** Skiping VM: {0}".format(vm.name) print "*** VM '{0}' will not boot until you manually fix it (or correctly restore this VM)!".format(vm.name)
host_collection.pop(vm.qid)
backup_collection.unlock_db() backup_collection.unlock_db()