Fix bugs in bundle_volume module

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

diff --git a/image_creator/bundle_volume.py b/image_creator/bundle_volume.py
index 457ae36..15f16ad 100644 (file)
--- a/image_creator/bundle_volume.py
+++ b/image_creator/bundle_volume.py
@@ -33,183 +33,231 @@
 
 import os
 import re
 
 import os
 import re

-import parted

 import uuid
 import uuid

+import tempfile

 from collections import namedtuple
 
 from collections import namedtuple
 

+import parted
+

 from image_creator.util import get_command
 from image_creator.util import FatalError
 
 findfs = get_command('findfs')
 truncate = get_command('truncate')
 dd = get_command('dd')
 from image_creator.util import get_command
 from image_creator.util import FatalError
 
 findfs = get_command('findfs')
 truncate = get_command('truncate')
 dd = get_command('dd')

+dmsetup = get_command('dmsetup')

 
 
 
 

-def fstable(f):
-    if not os.path.isfile(f):
-        raise FatalError("Unable to open: `%s'. File is missing." % f)
-
-    Entry = namedtuple('Entry', 'dev mpoint fs opts freq passno')
-
-    with open(f) as table:
-        for line in iter(table):
-            entry = line.split('#')[0].strip().split()
-            if len(entry) != 6:
-                continue
-            yield Entry(*entry)
+class BundleVolume():
+    _FileSystemEntry = namedtuple('FileSystemEntry',
+                                  'dev mpoint fs opts freq passno')

 
 

+    _Partition = namedtuple('Partition', 'num start end type fs mopts')

 
 

-def get_root_partition():
-    for entry in fstable('/etc/fstab'):
-        if entry.mpoint == '/':
-            return entry.dev
+    def __init__(self, out, meta):
+        self.out = out
+        self.meta = meta

 
 

-    raise FatalError("Unable to find root device in /etc/fstab")
+        self.out.output('Searching for root device ...', False)
+        root = self._get_root_partition()

 
 

+        if root.startswith("UUID=") or root.startswith("LABEL="):
+            self.root = findfs(root).stdout.strip()
+        else:
+            self.root = root

 
 

-def is_mpoint(path):
-    for entry in fstable('/proc/mounts'):
-        if entry.mpoint == path:
-            return True
-    return False
+        if not re.match('/dev/[hsv]d[a-z][1-9]*$', self.root):
+            raise FatalError("Don't know how to handle root device: %s" % \
+                             self.root)

 
 

+        self.disk = re.split('[0-9]', self.root)[0]

 
 

-def mpoint(device):
-    for entry in fstable('/proc/mounts'):
-        if not entry.dev.startswith('/'):
-            continue
+        out.success('%s' % self.root)

 
 

-        if os.path.realpath(entry.dev) == os.path.realpath(device):
-            return entry.mpoint
+    def _read_fstable(self, f):
+        if not os.path.isfile(f):
+            raise FatalError("Unable to open: `%s'. File is missing." % f)

 
 

-    return ""
+        with open(f) as table:
+            for line in iter(table):
+                entry = line.split('#')[0].strip().split()
+                if len(entry) != 6:
+                    continue
+                yield self._FileSystemEntry(*entry)

 
 

+    def _get_root_partition(self):
+        for entry in self._read_fstable('/etc/fstab'):
+            if entry.mpoint == '/':
+                return entry.dev

 
 

-def create_EBRs(src, dest):
-
-    # The Extended boot records precede the logical partitions they describe
-    extended = src.getExtendedPartition()
-    if not extended:
-        return
+        raise FatalError("Unable to find root device in /etc/fstab")

 
 

-    logical = src.getLogicalPartitions()
-    start = extended.geometry.start
-    for l in range(len(logical)):
-        end = l.geometry.start - 1
-        dd('if=%s' % src.path, 'of=%s' % dest, 'count=%d' % (end - start + 1),
-            'conv=notrunc', 'seek=%d' % start, 'skip=%d' % start)
-        start = l.geometry.end + 1
+    def _is_mpoint(self, path):
+        for entry in self._read_fstable('/proc/mounts'):
+            if entry.mpoint == path:
+                return True
+        return False

 
 

+    def _mount_options(self, device):
+        for entry in self._read_fstable('/proc/mounts'):
+            if not entry.dev.startswith('/'):
+                continue

 
 

-def bundle_volume(out, meta):
-
-    if is_mpoint('/mnt'):
-        raise FatalError('The directory /mnt where the image will be hosted'
-            'is mounted. Please unmount it and start over again.')
-
-    out.output('Searching for root device...', False)
-    root_part = get_root_partition()
-
-    if root_part.startswith("UUID=") or root_part.startswith("LABEL="):
-        root_part = findfs(root_part)
-    elif not root_part.startswith("/"):
-        raise FatalError("Unable to find a block device for: %s" % root_dev)
-
-    if not re.match('/dev/[hsv]d[a-z][1-9]*$', root_part):
-        raise FatalError("Don't know how to handle root device: %s" % root_dev)
+            if os.path.realpath(entry.dev) == os.path.realpath(device):
+                return entry

 
 

-    part_to_dev = lambda p: re.split('[0-9]', p)[0]
+        return

 
 

-    root_dev = part_to_dev(root_part)
+    def _create_partition_table(self, src_disk, dest_file):

 
 

-    out.success('%s' % root_dev)
+        if src_disk.type != 'msdos':
+            raise FatalError('Only msdos partition tables are supported')

 
 

-    src_dev = parted.Device(root_dev)
+        first_sector = src_disk.getPrimaryPartitions()[0].geometry.start

 
 

-    img = '/mnt/%s.diskdump' % uuid.uuid4().hex
-    disk_size = src_dev.getLength() * src_dev.sectorSize
+        # Copy the MBR and the space between the MBR and the first partition.
+        # In Grub version 1 Stage 1.5 is located there.
+        first_sector = src_disk.getPrimaryPartitions()[0].geometry.start

 
 

-    # Create sparse file to host the image
-    truncate("-s", "%d" % disk_size, img)
+        dd('if=%s' % src_disk.device.path, 'of=%s' % dest_file,
+           'bs=%d' % src_disk.device.sectorSize,
+           'count=%d' % first_sector, 'conv=notrunc')

 
 

-    src_disk = parted.Disk(src_dev)
-    if src_disk.type != 'msdos':
-        raise FatalError('For now we can only handle msdos partition tables')
+        # Create the Extended boot records (EBRs) in the image
+        extended = src_disk.getExtendedPartition()
+        if not extended:
+            return

 
 

-    # Copy the MBR and the space between the MBR and the first partition.
-    # In Grub version 1 Stage 1.5 is located there.
-    first_sector = src_disk.getPrimaryPartitions()[0].geometry.start
+        # Extended boot records precede the logical partitions they describe
+        logical = src_disk.getLogicalPartitions()
+        start = extended.geometry.start
+        for i in range(len(logical)):
+            end = logical[i].geometry.start - 1
+            dd('if=%s' % src_disk.device.path, 'of=%s' % dest_file,
+               'count=%d' % (end - start + 1), 'conv=notrunc',
+               'seek=%d' % start, 'skip=%d' % start)
+            start = logical[i].geometry.end + 1

 
 

-    dd('if=%s' % src_dev.path, 'of=%s' % img, 'bs=%d' % src_dev.sectorSize,
-        'count=%d' % first_sector, 'conv=notrunc')
+    def _shrink_partitions(self, src_disk, image_file):

 
 

-    # Create the Extended boot records (EBRs) in the image
-    create_EBRs(src_disk, img)
+        partitions = []
+        new_end = 0

 
 

-    img_dev = parted.Device(img)
-    img_disk = parted.Disk(img_dev)
+        image_dev = parted.Device(image_file)
+        image_disk = parted.Disk(image_dev)

 
 

-    Partition = namedtuple('Partition', 'num start end type fs mpoint')
+        is_extended = lambda p: p.type == parted.PARTITION_EXTENDED
+        is_logical = lambda p: p.type == parted.PARTITION_LOGICAL

 
 

-    partitions = []
-    for p in src_disk.partitions:
-        g = p.geometry
-        f = p.fileSystem
-        partitions.append(Partition(p.number, g.start, g.end, p.type,
-            f.type if f is not None else '', mpoint(p.path)))
+        partitions = []
+        for p in src_disk.partitions:
+            g = p.geometry
+            f = p.fileSystem
+            partitions.append(self._Partition(p.number, g.start, g.end,
+                              p.type, f.type if f is not None else '',
+                              self._mount_options(p.path)))

 
 

-    last = partitions[-1]
-    new_end = src_dev.getLength()
-    if last.fs == 'linux-swap(v1)':
-        size = (last.end - last.start + 1) * src_dev.sectorSize
-        MB = 2 ** 20
-        meta['SWAP'] = "%d:%s" % (last.num, ((size + MB - 1) // MB))
-        img_disk.deletePartition(img_disk.getPartitionBySector(last.start))
-        if last.type == parted.PARTITION_LOGICAL and last.num == 5:
-            img_disk.deletePartition(img_disk.getExtendedPartition())
-        partitions.remove(last)

         last = partitions[-1]
         last = partitions[-1]

-
-        # Leave 2048 blocks at the end
-        new_end = last.end + 2048
-
-    if last.mpoint:
-        stat = statvfs(last.mpoint)
-        occupied_blocks = stat.f_blocks - stat.f_bavail
-        new_size = (occupied * stat.f_frsize) // src_dev.sectorSize
-        # Add 10% just to be on the safe side
-        last.end = last.start + (new_size * 11) // 10
-
-        # Alighn to 2048
-        last.end = ((last.end + 2047) // 2048) * 2048
-
-        # Leave 2048 blocks at the end.
-        new_end = new_size + 2048
-
-        img_disk.setPartitionGeometry(
-            img_disk.getPartitionBySector(last.start),
-            parted.Constraint(device=img_dev), start=last.star, end=last.end)
-
-        if last.type == parted.PARTITION_LOGICAL:
-            # Fix the extended partition
-            ext = disk.getExtendedPartition()
-
-            img_disk.setPartitionGeometry(ext,
-                parted.Constraint(device=img_dev), ext.geometry.start,
-                end=last.end)
-
-    # Check if we have the available space on the filesystem hosting /mnt
-    # for the image.
-    out.output("Examining available space in /mnt ... ", False)
-    stat = os.statvfs('/mnt')
-    image_size = (new_end + 1) * src_dev.sectorSize
-    available = stat.f_bavail * stat.f_frsize
-
-    if available <= image_size:
-        raise FatalError('Not enough space in /mnt to host the image')
-
-    out.success("sufficient")
-
-    return img
+        new_end = src_disk.device.getLength()
+        if last.fs == 'linux-swap(v1)':
+            MB = 2 ** 20
+            size = (last.end - last.start + 1) * src_disk.device.sectorSize
+            self.meta['SWAP'] = "%d:%s" % (last.num, (size + MB - 1) // MB)
+
+            image_disk.deletePartition(
+                image_disk.getPartitionBySector(last.start))
+            image_disk.commit()
+
+            if is_logical(last) and last.num == 5:
+                extended = image_disk.getExtendedPartition()
+                image_disk.deletePartition(extended)
+                image_disk.commit()
+                partitions.remove(filter(is_extended, partitions)[0])
+
+            partitions.remove(last)
+            last = partitions[-1]
+
+            # Leave 2048 blocks at the end
+            new_end = last.end + 2048
+
+        if last.mopts.mpoint:
+            stat = os.statvfs(last.mopts.mpoint)
+            # Shrink the last partition. The new size should be the
+            # size of the occupied blocks
+            blcks = stat.f_blocks - stat.f_bavail
+            new_size = (blcks * stat.f_frsize) // src_disk.device.sectorSize
+
+            # Add 10% just to be on the safe side
+            part_end = last.start + (new_size * 11) // 10
+            # Alighn to 2048
+            part_end = ((part_end + 2047) // 2048) * 2048
+            last = last._replace(end=part_end)
+            partitions[-1] = last
+
+            # Leave 2048 blocks at the end.
+            new_end = new_size + 2048
+
+            image_disk.setPartitionGeometry(
+                image_disk.getPartitionBySector(last.start),
+                parted.Constraint(device=image_disk.device),
+                start=last.start, end=last.end)
+            image_disk.commit()
+
+            if last.type == parted.PARTITION_LOGICAL:
+                # Fix the extended partition
+                extended = disk.getExtendedPartition()
+
+                image_disk.setPartitionGeometry(extended,
+                    parted.Constraint(device=img_dev),
+                    ext.geometry.start, end=last.end)
+                image_disk.commit()
+
+        # Check if the available space is enough to host the image
+        location = os.path.dirname(image_file)
+        size = (new_end + 1) * src_disk.device.sectorSize
+        self.out.output("Examining available space in %s..." % location, False)
+        stat = os.statvfs(location)
+        available = stat.f_bavail * stat.f_frsize
+        if available <= size:
+            raise FatalError('Not enough space in %s to host the image' % \
+                             location)
+        self.out.success("sufficient")
+
+        return partitions
+
+    def _fill_partitions(self, src_disk, image, partitions):
+        pass
+
+    def create_image(self):
+
+        image_file = '/mnt/%s.diskdump' % uuid.uuid4().hex
+
+        src_dev = parted.Device(self.disk)
+
+        size = src_dev.getLength() * src_dev.sectorSize
+
+        # Create sparse file to host the image
+        truncate("-s", "%d" % size, image_file)
+
+        src_disk = parted.Disk(src_dev)
+        self._create_partition_table(src_disk, image_file)
+        partitions = self._shrink_partitions(src_disk, image_file)
+        self._fill_partitions(src_disk, image_file, partitions)
+
+        return image_file
+
+#      unmounted = filter(lambda p: not p.mopts.mpoint, partitions)
+#        mounted = filter(lambda p: p.mopts.mpoint, partitions)
+#
+#        for p in unmounted:
+#            dd('if=%s' % src_dev.path, 'of=%s' % img_dev.path,
+#               'count=%d' % (p.end - p.start + 1), 'conv=notrunc',
+#                'seek=%d' % p.start, 'skip=%d' % p.start)
+#
+#        partition_devices = create_devices(dest, partitions)
+#
+#        mounted.sort(key=lambda p: p.mopts.mpoint)
+#
+#        return img

 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :