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

backup: restore: Ignore qubes.xml in the second restore pass

Browse Source 
Already processed in backup prepare phase). This is only because
qfile-dom0-unpacker doesn't support selective unpack (like tar do).
This should be extended to skip also VMs not selected for restore.
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-09 18:54:52 +01:00
parent 1880f61c2d
commit 319158d5b1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/qubesutils.py
View File

@ -1460,6 +1460,13 @@ def restore_vm_dirs (backup_dir, backup_tmpdir, passphrase, vms_dirs, vms, vms_s
if hmacfile != filename + ".hmac":
raise QubesException("ERROR: expected hmac for {}, but got {}".format(filename, hmacfile))
# skip qubes.xml after receiving its hmac to skip both of them
if filename == 'qubes.xml.000':
print_callback("Ignoring already processed qubes.xml")
continue
# FIXME: skip VMs not selected for restore
print_callback("Verifying file "+filename)
print os.path.join(backup_tmpdir,filename)