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

hvm: copy template private.img during hvm creation if hvm is template based

Browse Source
This commit is contained in:
Olivier MEDOC 2013-12-12 10:01:39 +01:00 committed by Marek Marczykowski-Górecki
parent 4505d643f9
commit 2576e5000e
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core-modules/01QubesHVm.py
View File

@ -159,13 +159,26 @@ class QubesHVm(QubesVm):
f_root.truncate(defaults["hvm_disk_size"]) f_root.truncate(defaults["hvm_disk_size"])
f_root.close() f_root.close()
# create empty private.img if self.template is None:
if verbose: # create empty private.img
print >> sys.stderr, "--> Creating private image: {0}".\ if verbose:
format(self.private_img) print >> sys.stderr, "--> Creating private image: {0}".\
f_private = open(self.private_img, "w") format(self.private_img)
f_private.truncate(defaults["hvm_private_img_size"]) f_private = open(self.private_img, "w")
f_private.close() f_private.truncate(defaults["hvm_private_img_size"])
f_private.close()
else:
# copy template private.img
template_priv = self.template.private_img
if verbose:
print >> sys.stderr, "--> Copying the template's private image: {0}".\
format(template_priv)
# We prefer to use Linux's cp, because it nicely handles sparse files
retcode = subprocess.call (["cp", template_priv, self.private_img])
if retcode != 0:
raise IOError ("Error while copying {0} to {1}".\
format(template_priv, self.private_img))
# fire hooks # fire hooks
for hook in self.hooks_create_on_disk: for hook in self.hooks_create_on_disk: