From 657beaf65560d1d85823ffcb2eda1f990e2fdb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 25 Nov 2013 01:11:29 +0100 Subject: [PATCH] backups: move extracted dom0 home from /var/tmp instead of copy --- core/qubesutils.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/qubesutils.py b/core/qubesutils.py index 8fe9d272..304e5a24 100644 --- a/core/qubesutils.py +++ b/core/qubesutils.py @@ -2199,9 +2199,7 @@ def backup_restore_do(backup_dir, restore_tmpdir, passphrase, restore_info, home_file = home_dir + '/' + f if os.path.exists(home_file): os.rename(home_file, home_dir + '/' + restore_home_backupdir + '/' + f) - retcode = subprocess.call (["cp", "-nrp", backup_dom0_home_dir + '/' + f, home_file]) - if retcode != 0: - error_callback("*** Error while copying file {0} to {1}".format(backup_dom0_home_dir + '/' + f, home_file)) + shutil.move(backup_dom0_home_dir + '/' + f, home_file) retcode = subprocess.call(['sudo', 'chown', '-R', local_user, home_dir]) if retcode != 0: error_callback("*** Error while setting home directory owner")