diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-10-01 08:21:29 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-10-01 09:47:04 +0100 |
| commit | 558b7dbfb6a62490e65bb4a4667ab8bf03495f68 (patch) | |
| tree | cd32aeac062a69275ae5216173e29f17b4fc2405 /morphlib/exts | |
| parent | b15babc4a166e476d5bcd3946e8db8e2d4583969 (diff) | |
| download | morph-558b7dbfb6a62490e65bb4a4667ab8bf03495f68.tar.gz | |
ssh-rsync: gett UUID of the disk before writing fstab
With this patch, the fstab of the system to be deployed
as an upgrade will be conifgured using the UUID of
the disk.
Now when doing an upgrade is not needed to specify the
ROOT_DEVICE.
Diffstat (limited to 'morphlib/exts')
| -rwxr-xr-x | morphlib/exts/ssh-rsync.write | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/morphlib/exts/ssh-rsync.write b/morphlib/exts/ssh-rsync.write index c139b6c0..468e5a1f 100755 --- a/morphlib/exts/ssh-rsync.write +++ b/morphlib/exts/ssh-rsync.write @@ -54,9 +54,12 @@ class SshRsyncWriteExtension(morphlib.writeexts.WriteExtension): self.upgrade_remote_system(location, temp_root) def upgrade_remote_system(self, location, temp_root): - self.complete_fstab_for_btrfs_layout(temp_root) - root_disk = self.find_root_disk(location) + uuid = cliapp.ssh_runcmd(location, ['blkid', '-s', 'UUID', '-o', + 'value', root_disk]).strip() + + self.complete_fstab_for_btrfs_layout(temp_root, uuid) + version_label = os.environ.get('VERSION_LABEL') autostart = self.get_environment_boolean('AUTOSTART') |