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

Fix ignore-username-mismatch (#859)

Browse Source
This commit is contained in:
Wojciech Zygmunt Porczyk 2014-06-25 16:00:32 +02:00
parent dcba6b930a
commit 8ff423dc9a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/backup.py
View File

@ -1227,6 +1227,8 @@ def backup_restore_set_defaults(options):
options['dom0-home'] = True options['dom0-home'] = True
if 'replace-template' not in options: if 'replace-template' not in options:
options['replace-template'] = [] options['replace-template'] = []
if 'ignore-username-mismatch' not in options:
options['ignore-username-mismatch'] = False
return options return options
@ -1506,7 +1508,9 @@ def backup_restore_prepare(backup_location, passphrase, options = {},
vms_to_restore['dom0']['username'] = os.path.basename(dom0_home) vms_to_restore['dom0']['username'] = os.path.basename(dom0_home)
if vms_to_restore['dom0']['username'] != local_user: if vms_to_restore['dom0']['username'] != local_user:
vms_to_restore['dom0']['username-mismatch'] = True vms_to_restore['dom0']['username-mismatch'] = True
if not options['ignore-dom0-username-mismatch']: if options['ignore-username-mismatch']:
vms_to_restore['dom0']['ignore-username-mismatch'] = True
else:
vms_to_restore['dom0']['good-to-go'] = False vms_to_restore['dom0']['good-to-go'] = False
if 'good-to-go' not in vms_to_restore['dom0']: if 'good-to-go' not in vms_to_restore['dom0']:
@ -1613,6 +1617,8 @@ def backup_restore_print_summary(restore_info, print_callback = print_stdout):
s += fmt.format("") s += fmt.format("")
if 'username-mismatch' in restore_info['dom0']: if 'username-mismatch' in restore_info['dom0']:
s += " <-- username in backup and dom0 mismatch" s += " <-- username in backup and dom0 mismatch"
if 'ignore-username-mismatch' in restore_info['dom0']:
s += " (ignored)"
print_callback(s) print_callback(s)