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

backups: fix header handling when restoring from VM

Browse Source 
Do wait for nest reported filename only when restoring directly from
dom0. In VM case it isn't necessary and will cause false error report
(because filename will be set to nextfile at the end of restore process,
 so will be treated as spurious file without hmac).
This commit is contained in:
Marek Marczykowski-Górecki 2014-03-08 03:52:21 +01:00
parent 4a56b65b59
commit 7e507cba6a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/backup.py
View File

@ -988,7 +988,8 @@ def restore_vm_dirs (backup_source, restore_tmpdir, passphrase, vms_dirs, vms,
if vms_dirs and vms_dirs[0] == HEADER_FILENAME:
filename = filelist_pipe.readline().strip()
hmacfile = filelist_pipe.readline().strip()
nextfile = filelist_pipe.readline().strip()
if not appvm:
nextfile = filelist_pipe.readline().strip()
if BACKUP_DEBUG:
print_callback("Got backup header and hmac: %s, %s" % (filename,