X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/41bf4a8f462e04e08bfe6846178afe220b3349d4..6df939f732729bfbe24b8cc324cb8805aac280da:/image_creator/bundle_volume.py diff --git a/image_creator/bundle_volume.py b/image_creator/bundle_volume.py index a6fc27a..18d0245 100644 --- a/image_creator/bundle_volume.py +++ b/image_creator/bundle_volume.py @@ -53,6 +53,7 @@ losetup = get_command('losetup') mount = get_command('mount') umount = get_command('umount') blkid = get_command('blkid') +tune2fs = get_command('tune2fs') MKFS_OPTS = {'ext2': ['-F'], 'ext3': ['-F'], @@ -92,6 +93,7 @@ class BundleVolume(object): self.disk = parted.Disk(device) def _read_fstable(self, f): + """Use this generator to iterate over the lines of and fstab file""" if not os.path.isfile(f): raise FatalError("Unable to open: `%s'. File is missing." % f) @@ -106,6 +108,7 @@ class BundleVolume(object): yield FileSystemTableEntry(*entry) def _get_root_partition(self): + """Return the fstab entry accosiated with the root filesystem""" for entry in self._read_fstable('/etc/fstab'): if entry.mpoint == '/': return entry.dev @@ -113,12 +116,14 @@ class BundleVolume(object): raise FatalError("Unable to find root device in /etc/fstab") def _is_mpoint(self, path): + """Check if a directory is currently a mount point""" for entry in self._read_fstable('/proc/mounts'): if entry.mpoint == path: return True return False def _get_mount_options(self, device): + """Return the mount entry associated with a mounted device""" for entry in self._read_fstable('/proc/mounts'): if not entry.dev.startswith('/'): continue @@ -129,6 +134,7 @@ class BundleVolume(object): return None def _create_partition_table(self, image): + """Copy the partition table of the host system into the image""" # Copy the MBR and the space between the MBR and the first partition. # In msdos partition tables Grub Stage 1.5 is located there. @@ -163,6 +169,7 @@ class BundleVolume(object): start = logical[i].geometry.end + 1 def _get_partitions(self, disk): + """Returns a list with the partitions of the provided disk""" Partition = namedtuple('Partition', 'num start end type fs') partitions = [] @@ -177,7 +184,10 @@ class BundleVolume(object): return partitions def _shrink_partitions(self, image): - + """Remove the last partition of the image if it is a swap partition and + shrink the partition before that. Make sure it can still host all the + files the corresponding host file system hosts + """ new_end = self.disk.device.length image_disk = parted.Disk(parted.Device(image)) @@ -246,6 +256,7 @@ class BundleVolume(object): return (new_end, self._get_partitions(image_disk)) def _map_partition(self, dev, num, start, end): + """Map a partition into a block device using the device mapper""" name = os.path.basename(dev) + "_" + uuid.uuid4().hex tablefd, table = tempfile.mkstemp() try: @@ -258,21 +269,28 @@ class BundleVolume(object): return "/dev/mapper/%sp%d" % (name, num) def _unmap_partition(self, dev): + """Unmap a previously mapped partition""" if not os.path.exists(dev): return try_fail_repeat(dmsetup, 'remove', dev.split('/dev/mapper/')[1]) def _mount(self, target, devs): - + """Mount a list of filesystems in mountpoints relative to target""" devs.sort(key=lambda d: d[1]) - for dev, mpoint in devs: + for dev, mpoint, options in devs: absmpoint = os.path.abspath(target + mpoint) if not os.path.exists(absmpoint): os.makedirs(absmpoint) - mount(dev, absmpoint) + + if len(options) > 0: + mount(dev, absmpoint, '-o', ",".join(options)) + else: + mount(dev, absmpoint) def _umount_all(self, target): + """Unmount all filesystems that are mounted under the directory target + """ mpoints = [] for entry in self._read_fstable('/proc/mounts'): if entry.mpoint.startswith(os.path.abspath(target)): @@ -283,6 +301,10 @@ class BundleVolume(object): try_fail_repeat(umount, mpoint) def _to_exclude(self): + """Find which directories to exclude during the image copy. This is + accompliced by checking which directories serve as mount points for + virtual file systems + """ excluded = ['/tmp', '/var/tmp'] if self.tmp is not None: excluded.append(self.tmp) @@ -318,6 +340,9 @@ class BundleVolume(object): return excluded def _replace_uuids(self, target, new_uuid): + """Replace UUID references in various files. This is needed after + copying system files of the host into a new filesystem + """ files = ['/etc/fstab', '/boot/grub/grub.cfg', @@ -343,10 +368,16 @@ class BundleVolume(object): dest.write(line) def _create_filesystems(self, image, partitions): + """Fill the image with data. Host file systems that are not currently + mounted are binary copied into the image. For mounted file systems, a + file system level copy is performed. + """ filesystem = {} + orig_dev = {} for p in self.disk.partitions: filesystem[p.number] = self._get_mount_options(p.path) + orig_dev[p.number] = p.path unmounted = filter(lambda p: filesystem[p.num] is None, partitions) mounted = filter(lambda p: filesystem[p.num] is not None, partitions) @@ -361,6 +392,8 @@ class BundleVolume(object): self.out.success("done") loop = str(losetup('-f', '--show', image)).strip() + + # Recreate mounted file systems mapped = {} try: for p in mounted: @@ -374,21 +407,40 @@ class BundleVolume(object): self.out.output('Creating %s filesystem on partition %d ... ' % (fs, i), False) get_command('mkfs.%s' % fs)(*(MKFS_OPTS[fs] + [dev])) + + # For ext[234] enable the default mount options + if re.match('^ext[234]$', fs): + mopts = filter( + lambda p: p.startswith('Default mount options:'), + tune2fs('-l', orig_dev[i]).splitlines() + )[0].split(':')[1].strip().split() + + if not (len(mopts) == 1 and mopts[0] == '(none)'): + for opt in mopts: + tune2fs('-o', opt, dev) + self.out.success('done') new_uuid[i] = blkid( '-s', 'UUID', '-o', 'value', dev).stdout.strip() target = tempfile.mkdtemp() + devs = [] + for i in mapped.keys(): + fs = filesystem[i].fs + mpoint = filesystem[i].mpoint + opts = [] + for opt in filesystem[i].opts.split(','): + if opt in ('acl', 'user_xattr'): + opts.append(opt) + devs.append((mapped[i], mpoint, opts)) try: - absmpoints = self._mount(target, - [(mapped[i], filesystem[i].mpoint) - for i in mapped.keys()]) + self._mount(target, devs) + excluded = self._to_exclude() rsync = Rsync(self.out) - # Excluded paths need to be relative to the source - for excl in map(lambda p: p[1:], excluded + [image]): + for excl in excluded + [image]: rsync.exclude(excl) rsync.archive().hard_links().xattrs().sparse().acls() @@ -467,8 +519,8 @@ class BundleVolume(object): 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) + raise FatalError("Not enough space under %s to host the temporary " + "image" % dirname) self.out.success("sufficient") self._create_filesystems(image, partitions)