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

tools/qvm-template-postprocess: fix reinstall action

Browse Source 
Do not remove template directory after reinstalling it in dom0.

Fixes QubesOS/qubes-issues#3169
This commit is contained in:
Marek Marczykowski-Górecki 2018-04-21 15:07:21 +02:00
parent fbd5ca4150
commit c75c0176dc
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qubesadmin/tools/qvm_template_postprocess.py
View File

@ -196,14 +196,21 @@ def post_install(args):
app = args.app app = args.app
vm_created = False vm_created = False
# reinstall and running in dom0, using the same directory as qubes core
local_reinstall = False
try: try:
# reinstall # reinstall
vm = app.domains[args.name] vm = app.domains[args.name]
if app.qubesd_connection_type == 'socket' and \
args.dir == '/var/lib/qubes/vm-templates/' + args.name:
# VM exists and use use the same directory as target vm - on
# final cleanup remove only some files, not the whole directory
local_reinstall = True
except KeyError: except KeyError:
if app.qubesd_connection_type == 'socket' and \ if app.qubesd_connection_type == 'socket' and \
args.dir == '/var/lib/qubes/vm-templates/' + args.name: args.dir == '/var/lib/qubes/vm-templates/' + args.name:
# vm.create_on_disk() need to create the directory on its own, # vm.create_on_disk() need to create the directory on its own,
# move it away for from its way # move it away from its way
tmp_sourcedir = os.path.join('/var/lib/qubes/vm-templates', tmp_sourcedir = os.path.join('/var/lib/qubes/vm-templates',
'tmp-' + args.name) 'tmp-' + args.name)
shutil.move(args.dir, tmp_sourcedir) shutil.move(args.dir, tmp_sourcedir)
@ -229,7 +236,13 @@ def post_install(args):
yield from call_postinstall_service(vm) yield from call_postinstall_service(vm)
if not args.keep_source: if not args.keep_source:
shutil.rmtree(args.dir) if local_reinstall:
# remove only imported root img
root_path = os.path.join(args.dir, 'root.img')
for root_part in glob.glob(root_path + '.part.*'):
os.unlink(root_part)
else:
shutil.rmtree(args.dir)
# if running as root, tell underlying storage layer about just freed # if running as root, tell underlying storage layer about just freed
# data blocks # data blocks
if os.getuid() == 0: if os.getuid() == 0: