from image_creator.util import get_command
from image_creator.util import FatalError
from image_creator.util import try_fail_repeat
+from image_creator.util import free_space
findfs = get_command('findfs')
dd = get_command('dd')
class BundleVolume(object):
"""This class can be used to create an image out of the running system"""
- def __init__(self, out, meta):
+ def __init__(self, out, meta, tmp=None):
"""Create an instance of the BundleVolume class."""
self.out = out
self.meta = meta
+ self.tmp = tmp
self.out.output('Searching for root device ...', False)
root = self._get_root_partition()
# Add 10% just to be on the safe side
part_end = last.start + (new_size * 11) // 10
- # Alighn to 2048
+ # Align to 2048
part_end = ((part_end + 2047) // 2048) * 2048
image_disk.setPartitionGeometry(
def _to_exclude(self):
excluded = ['/tmp', '/var/tmp']
+ if self.tmp is not None:
+ excluded.append(self.tmp)
local_filesystems = MKFS_OPTS.keys() + ['rootfs']
for entry in self._read_fstable('/proc/mounts'):
if entry.fs in local_filesystems:
if not found_ancestor:
excluded.append(mpoint)
- return map(lambda d: d + "/*", excluded)
+ return excluded
def _replace_uuids(self, target, new_uuid):
absmpoints = self._mount(target,
[(mapped[i], filesystem[i].mpoint)
for i in mapped.keys()])
- exclude = self._to_exclude() + [image]
+ excluded = self._to_exclude()
rsync = Rsync(self.out)
# Excluded paths need to be relative to the source
- for excl in map(lambda p: os.path.relpath(p, '/'), exclude):
+ for excl in map(lambda p: os.path.relpath(p, '/'),
+ excluded + [image]):
rsync.exclude(excl)
rsync.archive().hard_links().xattrs().sparse().acls()
- rsync.run('/', target, 'host', 'tmp image')
+ rsync.run('/', target, 'host', 'temporary image')
+
+ # Create missing mountpoints. Since they are mountpoints, we
+ # cannot determine the ownership and the mode of the real
+ # directory. Make them inherit those properties from their
+ # parent dir
+ for excl in excluded:
+ dirname = os.path.dirname(excl)
+ stat = os.stat(dirname)
+ os.mkdir(target + excl, stat.st_mode)
+ os.chown(target + excl, stat.st_uid, stat.st_gid)
# We need to replace the old UUID referencies with the new
# ones in grub configuration files and /etc/fstab for file
# Check if the available space is enough to host the image
dirname = os.path.dirname(image)
- self.out.output("Examining available space in %s ..." % dirname, False)
- stat = os.statvfs(dirname)
- available = stat.f_bavail * stat.f_frsize
- if available <= size:
- raise FatalError('Not enough space in %s to host the image' %
+ self.out.output("Examining available space ...", False)
+ if free_space(dirname) <= size:
+ raise FatalError('Not enough space under %s to host the image' %
dirname)
self.out.success("sufficient")