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

backup: do not dereference symlinks in dom0 user home backup

Browse Source 
Symlinks there should be preserved. Additionally broken symlink would
cause the backup to fail.

Fixes QubesOS/qubes-issues#1515
This commit is contained in:
Marek Marczykowski-Górecki 2016-01-07 02:07:08 +01:00
parent 530a79417f
commit ba3b908b73
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/backup.py
View File

@ -567,15 +567,16 @@ def backup_do(base_backup_dir, files_to_backup, passphrase,
# be verified before untaring this. # be verified before untaring this.
# Prefix the path in archive with filename["subdir"] to have it # Prefix the path in archive with filename["subdir"] to have it
# verified during untar # verified during untar
tar_cmdline = ["tar", "-Pc", '--sparse', tar_cmdline = (["tar", "-Pc", '--sparse',
"-f", backup_pipe, "-f", backup_pipe,
'-C', os.path.dirname(filename["path"]), '-C', os.path.dirname(filename["path"])] +
'--dereference', (['--dereference'] if filename["subdir"] != "dom0-home/"
'--xform', 's:^%s:%s\\0:' % ( else []) +
['--xform', 's:^%s:%s\\0:' % (
os.path.basename(filename["path"]), os.path.basename(filename["path"]),
filename["subdir"]), filename["subdir"]),
os.path.basename(filename["path"]) os.path.basename(filename["path"])
] ])
if compressed: if compressed:
tar_cmdline.insert(-1, tar_cmdline.insert(-1,
"--use-compress-program=%s" % compression_filter) "--use-compress-program=%s" % compression_filter)