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')
umount = get_command('umount')
blkid = get_command('blkid')
-MKFS_OPTS = {
- 'ext2': ['-F'],
- 'ext3': ['-F'],
- 'ext4': ['-F'],
- 'reiserfs': ['-ff'],
- 'btrfs': [],
- 'minix': [],
- 'xfs': ['-f'],
- 'jfs': ['-f'],
- 'ntfs': ['-F'],
- 'msdos': [],
- 'vfat': []
- }
+MKFS_OPTS = {'ext2': ['-F'],
+ 'ext3': ['-F'],
+ 'ext4': ['-F'],
+ 'reiserfs': ['-ff'],
+ 'btrfs': [],
+ 'minix': [],
+ 'xfs': ['-f'],
+ 'jfs': ['-f'],
+ 'ntfs': ['-F'],
+ 'msdos': [],
+ 'vfat': []}
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()
raise FatalError("Unable to open: `%s'. File is missing." % f)
FileSystemTableEntry = namedtuple('FileSystemTableEntry',
- 'dev mpoint fs opts freq passno')
+ 'dev mpoint fs opts freq passno')
with open(f) as table:
for line in iter(table):
entry = line.split('#')[0].strip().split()
new_end = last.end + 2048
mount_options = self._get_mount_options(
- self.disk.getPartitionBySector(last.start).path)
+ self.disk.getPartitionBySector(last.start).path)
if mount_options is not None:
stat = os.statvfs(mount_options.mpoint)
# Shrink the last partition. The new size should be the size of the
# 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(
# Fix the extended partition
extended = disk.getExtendedPartition()
- image_disk.setPartitionGeometry(extended,
- parted.Constraint(device=img_dev),
+ image_disk.setPartitionGeometry(
+ extended, parted.Constraint(device=img_dev),
ext.geometry.start, end=last.end)
image_disk.commit()
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 mpoint in excluded:
continue
- descendants = filter(lambda p: p.startswith(mpoint + '/'),
- excluded)
+ descendants = filter(
+ lambda p: p.startswith(mpoint + '/'), excluded)
if len(descendants):
for d in descendants:
excluded.remove(d)
if not found_ancestor:
excluded.append(mpoint)
- return map(lambda d: d + "/*", excluded)
+ return excluded
def _replace_uuids(self, target, new_uuid):
'/boot/grub/menu.lst',
'/boot/grub/grub.conf']
- orig = dict(map(lambda p: (p.number, blkid('-s', 'UUID', '-o',
- 'value', p.path).stdout.strip()), self.disk.partitions))
+ orig = dict(map(
+ lambda p: (
+ p.number,
+ blkid('-s', 'UUID', '-o', 'value', p.path).stdout.strip()),
+ self.disk.partitions))
for f in map(lambda f: target + f, files):
for i, dev in mapped.iteritems():
fs = filesystem[i].fs
self.out.output('Creating %s filesystem on partition %d ... ' %
- (fs, i), False)
+ (fs, i), False)
get_command('mkfs.%s' % fs)(*(MKFS_OPTS[fs] + [dev]))
self.out.success('done')
- new_uuid[i] = blkid('-s', 'UUID', '-o', 'value', dev
- ).stdout.strip()
+ new_uuid[i] = blkid(
+ '-s', 'UUID', '-o', 'value', dev).stdout.strip()
target = tempfile.mkdtemp()
try:
absmpoints = self._mount(target,
- [(mapped[i], filesystem[i].mpoint) for i in mapped.keys()]
- )
- exclude = self._to_exclude() + [image]
- rsync = Rsync('/', target,
- map(lambda p: os.path.relpath(p, '/'), exclude))
- rsync.archive().run(self.out)
-
+ [(mapped[i], filesystem[i].mpoint)
+ for i in mapped.keys()])
+ 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, '/'),
+ excluded + [image]):
+ rsync.exclude(excl)
+
+ rsync.archive().hard_links().xattrs().sparse().acls()
+ 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
+ # systems that have been recreated.
self._replace_uuids(target, new_uuid)
finally:
end_sector = self._shrink_partitions(image)
- # Check if the available space is enough to host the image
- dirname = os.path.dirname(image)
size = (end_sector + 1) * self.disk.device.sectorSize
- 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' %
- dirname)
- self.out.success("sufficient")
-
- self._create_filesystems(image)
- # Truncate image to the new size. I counldn't find a better way to do
- # this. It seems that python's high level functions work in a different
- # way.
+ # Truncate image to the new size.
fd = os.open(image, os.O_RDWR)
try:
os.ftruncate(fd, size)
finally:
os.close(fd)
+ # Check if the available space is enough to host the image
+ dirname = os.path.dirname(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")
+
+ self._create_filesystems(image)
+
return image
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :
projects / snf-image-creator / blobdiff