Create fs in image partitions in bundle_volume

[snf-image-creator] / image_creator / disk.py

diff --git a/image_creator/disk.py b/image_creator/disk.py
index d2c4458..b662c07 100644 (file)
--- a/image_creator/disk.py
+++ b/image_creator/disk.py
@@ -34,8 +34,7 @@
 from image_creator.util import get_command
 from image_creator.util import FatalError
 from image_creator.gpt import GPTPartitionTable
-
-import image_creator.bundle_volume
+from image_creator.bundle_volume import BundleVolume
 
 import stat
 import os
@@ -80,28 +79,10 @@ class Disk(object):
         self._add_cleanup(losetup, '-d', loop)
         return loop
 
-    def _map_partition(self, dev, index, start, end):
-        name = "%sp%d" % (os.path.basename(dev), index)
-        tablefd, table = tempfile.mkstemp()
-        try:
-            size = end - start + 1
-            os.write(tablefd, "0 %d linear %s %d" % (start, dev, size))
-            dmsetup('create', name, table)
-        finally:
-            os.unlink(table)
-
-    def _unmap_partition(self, dev, index):
-        name = "%sp%d" % (os.path.basename(dev), index)
-        if not os.path.exists("/dev/mapper/%s" % name):
-            return
-
-        dmsetup('remove', name)
-        time.sleep(0.5)
-
     def _dir_to_disk(self):
         if self.source == '/':
             bundle = BundleVolume(self.out, self.meta)
-            return _losetup(bundle.create_image())
+            return self._losetup(bundle.create_image())
         raise FatalError("Using a directory as media source is supported")
 
     def cleanup(self):
@@ -232,7 +213,7 @@ class DiskDevice(object):
         self.progressbar.success('done')
         self.progressbar = None
 
-        self.out.output('Inspecting Operating System...', False)
+        self.out.output('Inspecting Operating System ...', False)
         roots = self.g.inspect_os()
         if len(roots) == 0:
             raise FatalError("No operating system found")