From 2576e5000e165c373f69d87e22a27ffa4a0d4ccf Mon Sep 17 00:00:00 2001
From: Olivier MEDOC <o_medoc@yahoo.fr>
Date: Thu, 12 Dec 2013 10:01:39 +0100
Subject: [PATCH] hvm: copy template private.img during hvm creation if hvm is
 template based

---
 core-modules/01QubesHVm.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/core-modules/01QubesHVm.py b/core-modules/01QubesHVm.py
index 8cf1f241..586c89c6 100644
--- a/core-modules/01QubesHVm.py
+++ b/core-modules/01QubesHVm.py
@@ -159,13 +159,26 @@ class QubesHVm(QubesVm):
             f_root.truncate(defaults["hvm_disk_size"])
             f_root.close()
 
-        # create empty private.img
-        if verbose:
-            print >> sys.stderr, "--> Creating private image: {0}".\
-                format(self.private_img)
-        f_private = open(self.private_img, "w")
-        f_private.truncate(defaults["hvm_private_img_size"])
-        f_private.close()
+        if self.template is None:
+            # create empty private.img
+            if verbose:
+                print >> sys.stderr, "--> Creating private image: {0}".\
+                    format(self.private_img)
+            f_private = open(self.private_img, "w")
+            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
         for hook in self.hooks_create_on_disk: