diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-19 16:21:47 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-28 18:26:15 +0000 |
commit | 2141b7d7739d64708232dde2f9c5b594baae9687 (patch) | |
tree | fde57c3822a7e09f8bd868fdd60498e8540f5262 | |
parent | db03478d164dd36bbf5feaa53a4841e01cfbcb37 (diff) | |
download | morph-2141b7d7739d64708232dde2f9c5b594baae9687.tar.gz |
Modify rawdisk.write to allow the deployment to devices
This patch also modifies rawdisk.write to use the UPGRADE environment
variable to figure out when is doing an upgrade or a fresh deployment.
This change is important because os.path.isfile doesn't work with
devices.
-rwxr-xr-x | morphlib/exts/rawdisk.write | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write index 12db4398..8cd18a71 100755 --- a/morphlib/exts/rawdisk.write +++ b/morphlib/exts/rawdisk.write @@ -43,11 +43,16 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension): raise cliapp.AppException('Wrong number of command line args') temp_root, location = args - if os.path.isfile(location): + upgrade = self.get_environment_boolean('UPGRADE') + + if upgrade: self.upgrade_local_system(location, temp_root) else: try: - self.create_local_system(temp_root, location) + if not self.is_device(location): + self.create_diskimage(location) + self.format_btrfs(location) + self.create_system(temp_root, location) self.status(msg='Disk image has been created at %s' % location) except Exception: self.status(msg='Failure to create disk image at %s' % |