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

qvm-template-postprocess: do not remove VM on failed reinstall

Browse Source 
If root volume import fails on template reinstall, do not remove it -
keep it alone, with old volume content

QubesOS/qubes-issues#3169
This commit is contained in:
Marek Marczykowski-Górecki 2018-03-19 11:44:57 +01:00
parent 562137c36d
commit 96a32bd096
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubesadmin/tools/qvm_template_postprocess.py
View File

@ -195,6 +195,7 @@ def post_install(args):
'''Handle post-installation tasks''' '''Handle post-installation tasks'''
app = args.app app = args.app
vm_created = False
try: try:
# reinstall # reinstall
vm = app.domains[args.name] vm = app.domains[args.name]
@ -211,13 +212,15 @@ def post_install(args):
vm = app.add_new_vm('TemplateVM', vm = app.add_new_vm('TemplateVM',
name=args.name, name=args.name,
label=qubesadmin.config.defaults['template_label']) label=qubesadmin.config.defaults['template_label'])
vm_created = True
vm.log.info('Importing data') vm.log.info('Importing data')
try: try:
import_root_img(vm, args.dir) import_root_img(vm, args.dir)
except: except:
# if data import fails, remove half-created VM # if data import fails, remove half-created VM
del app.domains[vm.name] if vm_created:
del app.domains[vm.name]
raise raise
vm.installed_by_rpm = True vm.installed_by_rpm = True
import_appmenus(vm, args.dir) import_appmenus(vm, args.dir)