X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/f99fe99d6f3beaf5b282267f30c1ca288be92e40..023e1217b32385bae8007e8366f5fb9d5b95f8ed:/image_creator/disk.py

diff --git a/image_creator/disk.py b/image_creator/disk.py
index 2c034a9..c367efd 100644
--- a/image_creator/disk.py
+++ b/image_creator/disk.py
@@ -114,12 +114,12 @@ class Disk(object):
 
         # Take a snapshot and return it to the user
         self.out.output("Snapshotting media source...", False)
-        size = blockdev('--getsize', sourcedev)
+        size = blockdev('--getsz', sourcedev)
         cowfd, cow = tempfile.mkstemp()
         os.close(cowfd)
         self._add_cleanup(os.unlink, cow)
-        # Create 1G cow sparse file
-        dd('if=/dev/null', 'of=%s' % cow, 'bs=1k', 'seek=%d' % (1024 * 1024))
+        # Create cow sparse file
+        dd('if=/dev/null', 'of=%s' % cow, 'bs=512', 'seek=%d' % int(size))
         cowdev = self._losetup(cow)
 
         snapshot = uuid.uuid4().hex
@@ -168,6 +168,7 @@ class DiskDevice(object):
         self.bootable = bootable
         self.progress_bar = None
         self.guestfs_device = None
+        self.size = 0
         self.meta = {}
 
         self.g = guestfs.GuestFS()
@@ -210,10 +211,10 @@ class DiskDevice(object):
             raise FatalError("No operating system found")
         if len(roots) > 1:
             raise FatalError("Multiple operating systems found."
-                             "We only support images with one filesystem.")
+                             "We only support images with one OS.")
         self.root = roots[0]
         self.guestfs_device = self.g.part_to_dev(self.root)
-        self.meta['SIZE'] = self.g.blockdev_getsize64(self.guestfs_device)
+        self.size = self.g.blockdev_getsize64(self.guestfs_device)
         self.meta['PARTITION_TABLE'] = \
             self.g.part_get_parttype(self.guestfs_device)
 
@@ -343,12 +344,12 @@ class DiskDevice(object):
             # Most disk manipulation programs leave 2048 sectors after the last
             # partition
             new_size = last_part['part_end'] + 1 + 2048 * sector_size
-            self.meta['SIZE'] = min(self.meta['SIZE'], new_size)
+            self.size = min(self.size, new_size)
             break
 
         if not re.match("ext[234]", fstype):
             self.out.warn("Don't know how to resize %s partitions." % fstype)
-            return self.meta['SIZE']
+            return self.size
 
         part_dev = "%s%d" % (self.guestfs_device, last_part['part_num'])
         self.g.e2fsck_f(part_dev)
@@ -405,19 +406,17 @@ class DiskDevice(object):
 
         new_size = (end + 1) * sector_size
 
-        assert (new_size <= self.meta['SIZE'])
+        assert (new_size <= self.size)
 
         if self.meta['PARTITION_TABLE'] == 'gpt':
             ptable = GPTPartitionTable(self.real_device)
-            self.meta['SIZE'] = ptable.shrink(new_size, self.meta['SIZE'])
+            self.size = ptable.shrink(new_size, self.size)
         else:
-            self.meta['SIZE'] = min(new_size + 2048 * sector_size,
-                                    self.meta['SIZE'])
+            self.size = min(new_size + 2048 * sector_size, self.size)
 
-        self.out.success("new size is %dMB" %
-                         ((self.meta['SIZE'] + MB - 1) // MB))
+        self.out.success("new size is %dMB" % ((self.size + MB - 1) // MB))
 
-        return self.meta['SIZE']
+        return self.size
 
     def dump(self, outfile):
         """Dumps the content of device into a file.
@@ -427,7 +426,7 @@ class DiskDevice(object):
         """
         MB = 2 ** 20
         blocksize = 4 * MB  # 4MB
-        size = self.meta['SIZE']
+        size = self.size
         progr_size = (size + MB - 1) // MB  # in MB
         progressbar = self.out.Progress(progr_size, "Dumping image file", 'mb')