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 stat
import os
import tempfile
self._devices = []
self.source = source
self.out = output
+ self.meta = {}
def _add_cleanup(self, job, *args):
self._cleanup_jobs.append((job, args))
return loop
def _dir_to_disk(self):
- raise FatalError("Using a directory as media source is not supported "
- "yet!")
+ if self.source == '/':
+ return bundle_volume(self.out, self.meta)
+ raise FatalError("Using a directory as media source is supported")
def cleanup(self):
"""Cleanup internal data. This needs to be called before the
program ends.
"""
- while len(self._devices):
- device = self._devices.pop()
- device.destroy()
-
- while len(self._cleanup_jobs):
- job, args = self._cleanup_jobs.pop()
- job(*args)
+ try:
+ while len(self._devices):
+ device = self._devices.pop()
+ device.destroy()
+ finally:
+ # Make sure those are executed even if one of the device.destroy
+ # methods throws exeptions.
+ while len(self._cleanup_jobs):
+ job, args = self._cleanup_jobs.pop()
+ job(*args)
def snapshot(self):
"""Creates a snapshot of the original source media of the Disk
# 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
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)
def destroy(self):
"""Destroy this DiskDevice instance."""
- if self.guestfs_enabled:
- self.g.umount_all()
- self.g.sync()
-
- # Close the guestfs handler if open
- self.g.close()
+ # In new guestfs versions, there is a handy shutdown method for this
+ try:
+ if self.guestfs_enabled:
+ self.g.umount_all()
+ self.g.sync()
+ finally:
+ # Close the guestfs handler if open
+ self.g.close()
def progress_callback(self, ev, eh, buf, array):
position = array[2]
"""Mount all disk partitions in a correct order."""
mount = self.g.mount_ro if readonly else self.g.mount
- self.out.output("Mounting image...", False)
+ msg = " read-only" if readonly else ""
+ self.out.output("Mounting the media%s..." % msg, False)
mps = self.g.inspect_get_mountpoints(self.root)
# Sort the keys to mount the fs in a correct order.
progressbar.next()
while left > 0:
length = min(left, blocksize)
- sent = sendfile(dst.fileno(), src.fileno(), offset, length)
+ _, sent = sendfile(dst.fileno(), src.fileno(), offset,
+ length)
offset += sent
left -= sent
progressbar.goto((size - left) // MB)