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

tools/qvm-template-postprocess: improve error handling

Browse Source 
Don't fail the whole process when "just" appmenus import fails.
But if data import fails, remove the VM

Also update for vm.run_service_for_stdio raising CalledProcessError.
This commit is contained in:
Marek Marczykowski-Górecki 2017-06-25 15:09:57 +02:00
parent ce7d4865b6
commit 0012eb3ac6
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qubesadmin/tools/qvm_template_postprocess.py
View File

@ -132,12 +132,15 @@ def import_appmenus(vm, source_dir):
# TODO: change this to qrexec calls to GUI VM, when GUI VM will be # TODO: change this to qrexec calls to GUI VM, when GUI VM will be
# implemented # implemented
subprocess.check_call(cmd_prefix + ['qvm-appmenus', try:
'--set-default-whitelist={}'.format(os.path.join(source_dir, subprocess.check_call(cmd_prefix + ['qvm-appmenus',
'vm-whitelisted-appmenus.list')), vm.name]) '--set-default-whitelist={}'.format(os.path.join(source_dir,
subprocess.check_call(cmd_prefix + ['qvm-appmenus', 'vm-whitelisted-appmenus.list')), vm.name])
'--set-whitelist={}'.format(os.path.join(source_dir, subprocess.check_call(cmd_prefix + ['qvm-appmenus',
'whitelisted-appmenus.list')), vm.name]) '--set-whitelist={}'.format(os.path.join(source_dir,
'whitelisted-appmenus.list')), vm.name])
except subprocess.CalledProcessError as e:
vm.log.warning('Failed to set default application list: %s', e)
def post_install(args): def post_install(args):
@ -162,7 +165,12 @@ def post_install(args):
label=qubesadmin.config.defaults['template_label']) label=qubesadmin.config.defaults['template_label'])
vm.log.info('Importing data') vm.log.info('Importing data')
import_root_img(vm, args.dir) try:
import_root_img(vm, args.dir)
except:
# if data import fails, remove half-created VM
del app.domains[vm.name]
raise
import_appmenus(vm, args.dir) import_appmenus(vm, args.dir)
if not args.skip_start: if not args.skip_start:
@ -178,7 +186,7 @@ def post_install(args):
else: else:
try: try:
vm.run_service_for_stdio('qubes.PostInstall') vm.run_service_for_stdio('qubes.PostInstall')
except qubesadmin.exc.QubesVMError: except subprocess.CalledProcessError:
vm.log.error('qubes.PostInstall service failed') vm.log.error('qubes.PostInstall service failed')
vm.shutdown() vm.shutdown()
if have_events: if have_events:
@ -198,8 +206,8 @@ def post_install(args):
timeout -= 1 timeout -= 1
if not vm.is_halted(): if not vm.is_halted():
vm.kill() vm.kill()
finally:
vm.netvm = qubesadmin.DEFAULT vm.netvm = qubesadmin.DEFAULT
return 0 return 0