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

backups: fix restore dom0 home from old backup format

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2013-12-06 06:55:23 +01:00
parent ebf0a275a1
commit 84f8a8a8f1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/backup.py
View File

@ -1375,7 +1375,10 @@ def backup_restore_do(backup_location, restore_tmpdir, passphrase, restore_info,
backup_path = restore_info['dom0']['subdir'] backup_path = restore_info['dom0']['subdir']
local_user = grp.getgrnam('qubes').gr_mem[0] local_user = grp.getgrnam('qubes').gr_mem[0]
home_dir = pwd.getpwnam(local_user).pw_dir home_dir = pwd.getpwnam(local_user).pw_dir
backup_dom0_home_dir = os.path.join(restore_tmpdir, backup_path) if format_version == 1:
backup_dom0_home_dir = os.path.join(backup_location, backup_path)
else:
backup_dom0_home_dir = os.path.join(restore_tmpdir, backup_path)
restore_home_backupdir = "home-pre-restore-{0}".format (time.strftime("%Y-%m-%d-%H%M%S")) restore_home_backupdir = "home-pre-restore-{0}".format (time.strftime("%Y-%m-%d-%H%M%S"))
print_callback("-> Restoring home of user '{0}'...".format(local_user)) print_callback("-> Restoring home of user '{0}'...".format(local_user))