Further development in bundle_volume

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

diff --git a/image_creator/disk.py b/image_creator/disk.py
index deafb95..d2c4458 100644 (file)
--- a/image_creator/disk.py
+++ b/image_creator/disk.py
@@ -34,7 +34,9 @@
 from image_creator.util import get_command
 from image_creator.util import FatalError
 from image_creator.gpt import GPTPartitionTable
 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
+
+import image_creator.bundle_volume
+

 import stat
 import os
 import tempfile
 import stat
 import os
 import tempfile

@@ -67,6 +69,7 @@ class Disk(object):
         self._devices = []
         self.source = source
         self.out = output
         self._devices = []
         self.source = source
         self.out = output

+        self.meta = {}

 
     def _add_cleanup(self, job, *args):
         self._cleanup_jobs.append((job, args))
 
     def _add_cleanup(self, job, *args):
         self._cleanup_jobs.append((job, args))

@@ -77,9 +80,28 @@ class Disk(object):
         self._add_cleanup(losetup, '-d', loop)
         return loop
 
         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 == '/':
     def _dir_to_disk(self):
         if self.source == '/':

-            return bundle_volume(self.out)
+            bundle = BundleVolume(self.out, self.meta)
+            return _losetup(bundle.create_image())

         raise FatalError("Using a directory as media source is supported")
 
     def cleanup(self):
         raise FatalError("Using a directory as media source is supported")
 
     def cleanup(self):

@@ -107,7 +129,7 @@ class Disk(object):
         mode = os.stat(self.source).st_mode
         if stat.S_ISDIR(mode):
             self.out.success('looks like a directory')
         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)
         elif stat.S_ISREG(mode):
             self.out.success('looks like an image file')
             sourcedev = self._losetup(self.source)

@@ -165,16 +187,16 @@ class DiskDevice(object):
     as created by the device-mapper.
     """
 
     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
         """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.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)
 
         self.g = guestfs.GuestFS()
         self.g.add_drive_opts(self.real_device, readonly=0)