diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-11 15:42:07 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-28 18:26:15 +0000 |
commit | db03478d164dd36bbf5feaa53a4841e01cfbcb37 (patch) | |
tree | dd2e5b749d6fc3769a1a945e668ed52d6aec4dc7 | |
parent | db43e38a7f24b770d68fd6ebbe78becb3346fbee (diff) | |
download | morph-db03478d164dd36bbf5feaa53a4841e01cfbcb37.tar.gz |
Split create_local_system on various methods
This way we can still use create_local_system to create
a raw disk, but also reuse bits of it to be able e.g. to
deploy to devices.
-rw-r--r-- | morphlib/writeexts.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py index 31e7a0b6..6da875a0 100644 --- a/morphlib/writeexts.py +++ b/morphlib/writeexts.py @@ -147,25 +147,37 @@ class WriteExtension(cliapp.Application): def create_local_system(self, temp_root, raw_disk): '''Create a raw system image locally.''' + + self.create_diskimage(raw_disk) + try: + self.format_btrfs(raw_disk) + self.create_system(temp_root, raw_disk) + except BaseException, e: + os.remove(raw_disk) + raise + + def create_diskimage(self, raw_disk): size = self.get_disk_size() if not size: raise cliapp.AppException('DISK_SIZE is not defined') self.create_raw_disk_image(raw_disk, size) + + def format_btrfs(self, raw_disk): try: self.mkfs_btrfs(raw_disk) - mp = self.mount(raw_disk) except BaseException: sys.stderr.write('Error creating disk image') - os.remove(raw_disk) raise + + def create_system(self, temp_root, raw_disk): try: + mp = self.mount(raw_disk) self.create_btrfs_system_layout( temp_root, mp, version_label='factory', disk_uuid=self.get_uuid(raw_disk)) except BaseException, e: sys.stderr.write('Error creating Btrfs system layout') self.unmount(mp) - os.remove(raw_disk) raise else: self.unmount(mp) |