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

qvm-backup-restore: fix template restore process

Browse Source
This commit is contained in:
Joanna Rutkowska 2010-06-29 02:19:40 +02:00
parent 74e820a4e5
commit b0ed1e12d2
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom0/qvm-tools/qvm-backup-restore
View File

@ -24,6 +24,7 @@ from qubes.qubes import QubesVmCollection
from qubes.qubes import QubesException from qubes.qubes import QubesException
from qubes.qubes import qubes_store_filename from qubes.qubes import qubes_store_filename
from qubes.qubes import qubes_base_dir from qubes.qubes import qubes_base_dir
from qubes.qubes import qubes_templates_dir
from optparse import OptionParser from optparse import OptionParser
import os import os
@ -86,10 +87,21 @@ def restore_vm_file (backup_dir, file_path):
#print "cp -rp {0} {1}".format (backup_file_path, file_path) #print "cp -rp {0} {1}".format (backup_file_path, file_path)
# We prefer to use Linux's cp, because it nicely handles sparse files # We prefer to use Linux's cp, because it nicely handles sparse files
retcode = subprocess.call (["cp", "-rp", backup_file_path, file_path]) retcode = subprocess.call (["cp", "-p", backup_file_path, file_path])
if retcode != 0: if retcode != 0:
print "*** Error while copying file {0} to {1}".format(backup_file_path, file_path) print "*** Error while copying file {0} to {1}".format(backup_file_path, file_path)
return exit (1)
def restore_vm_dir (backup_dir, src_dir, dst_dir):
backup_src_dir = src_dir.replace (qubes_base_dir, backup_dir)
# We prefer to use Linux's cp, because it nicely handles sparse files
retcode = subprocess.call (["cp", "-rp", backup_src_dir, dst_dir])
if retcode != 0:
print "*** Error while copying file {0} to {1}".format(backup_src_dir, dest_dir)
exit (1)
def main(): def main():
usage = "usage: %prog [options] <backup-dir>" usage = "usage: %prog [options] <backup-dir>"
@ -271,7 +283,7 @@ def main():
restore_vm_file (backup_dir, vm.rootcow_img) restore_vm_file (backup_dir, vm.rootcow_img)
elif vm.is_templete(): elif vm.is_templete():
restore_vm_file (backup_dir, vm.dir_path + "/*"); restore_vm_dir (backup_dir, vm.dir_path, qubes_templates_dir);
else: else:
print "ERROR: VM '{0}', type='{1}': unsupported VM type!".format(vm.name, vm.type) print "ERROR: VM '{0}', type='{1}': unsupported VM type!".format(vm.name, vm.type)