From 9ca78c5d39878350cbf7ff81cc43ac5c9a9fdf36 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Mon, 20 May 2013 11:20:28 +0000 Subject: Implement raw disk upgrades. We perform this by cloning an existing orig directory and then updating the contents using rsync --- morphlib/exts/rawdisk.write | 54 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write index a55473f2..76438a5e 100755 --- a/morphlib/exts/rawdisk.write +++ b/morphlib/exts/rawdisk.write @@ -18,6 +18,7 @@ '''A Morph deployment write extension for raw disk images.''' +import cliapp import os import sys import time @@ -30,8 +31,10 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension): '''Create a raw disk image during Morph's deployment. + If the image already exists, it is upgraded. + The location command line argument is the pathname of the disk image - to be created. + to be created/upgraded. ''' @@ -40,9 +43,52 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension): raise cliapp.AppException('Wrong number of command line args') temp_root, location = args - - self.create_local_system(temp_root, location) - self.status(msg='Disk image has been created at %s' % location) + if os.path.isfile(location): + self.upgrade_local_system(location, temp_root) + else: + self.create_local_system(temp_root, location) + self.status(msg='Disk image has been created at %s' % location) + + def upgrade_local_system(self, raw_disk, temp_root): + mp = self.mount(raw_disk) + + version_label = self.get_version_label(mp) + self.status(msg='Updating image to a new version with label %s' % + version_label) + + version_root = os.path.join(mp, 'systems', version_label) + os.mkdir(version_root) + + old_orig = os.path.join(mp, 'systems', 'version1', 'orig') + new_orig = os.path.join(version_root, 'orig') + cliapp.runcmd( + ['btrfs', 'subvolume', 'snapshot', old_orig, new_orig]) + + cliapp.runcmd( + ['rsync', '-a', '--checksum', '--numeric-ids', '--delete', + temp_root + os.path.sep, new_orig]) + + self.create_run(version_root) + + if self.bootloader_is_wanted(): + self.install_kernel(version_root, temp_root) + self.install_extlinux(mp, version_label) + + self.unmount(mp) + + def get_version_label(self, mp): + version_label = os.environ.get('VERSION_LABEL') + + if version_label is None: + self.unmount(mp) + raise cliapp.AppException('VERSION_LABEL was not given') + + if os.path.exists(os.path.join(mp, 'systems', version_label)): + self.unmount(mp) + raise cliapp.AppException('VERSION_LABEL %s already exists' + % version_label) + + return version_label RawDiskWriteExtension().run() -- cgit v1.2.1