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 f3df5e8..b662c07 100644 (file)
--- a/image_creator/disk.py
+++ b/image_creator/disk.py
@@ -34,7 +34,8 @@
 from image_creator.util import get_command
 from image_creator.util import FatalError
 from image_creator.gpt import GPTPartitionTable
-from image_creator.bundle_volume import bundle_volume
+from image_creator.bundle_volume import BundleVolume
+
 import stat
 import os
 import tempfile
@@ -67,6 +68,7 @@ class Disk(object):
         self._devices = []
         self.source = source
         self.out = output
+        self.meta = {}
 
     def _add_cleanup(self, job, *args):
         self._cleanup_jobs.append((job, args))
@@ -79,7 +81,8 @@ class Disk(object):
 
     def _dir_to_disk(self):
         if self.source == '/':
-            return bundle_volume()
+            bundle = BundleVolume(self.out, self.meta)
+            return self._losetup(bundle.create_image())
         raise FatalError("Using a directory as media source is supported")
 
     def cleanup(self):
@@ -107,7 +110,7 @@ class Disk(object):
         mode = os.stat(self.source).st_mode
         if stat.S_ISDIR(mode):
             self.out.success('looks like a directory')
-            return self._losetup(self._dir_to_disk())
+            return self._dir_to_disk()
         elif stat.S_ISREG(mode):
             self.out.success('looks like an image file')
             sourcedev = self._losetup(self.source)
@@ -165,16 +168,16 @@ class DiskDevice(object):
     as created by the device-mapper.
     """
 
-    def __init__(self, device, output, bootable=True):
+    def __init__(self, device, output, bootable=True, meta={}):
         """Create a new DiskDevice."""
 
         self.real_device = device
         self.out = output
         self.bootable = bootable
+        self.meta = meta
         self.progress_bar = None
         self.guestfs_device = None
         self.size = 0
-        self.meta = {}
 
         self.g = guestfs.GuestFS()
         self.g.add_drive_opts(self.real_device, readonly=0)
@@ -210,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")