diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-10-10 13:09:25 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-10-10 13:09:25 +0000 |
| commit | aa7005c9b4207ac32621433a95a0c9b44007f6b4 (patch) | |
| tree | 85e22e6644323b62369e209f31c98e304f58748d | |
| parent | 7ec3d106f49fd4af2d193afc976c2230a9369a7e (diff) | |
| download | definitions-aa7005c9b4207ac32621433a95a0c9b44007f6b4.tar.gz | |
Merge branch 'baserock/richardmaw/fix-ssh-rsync-destroying-versions'
Reviewed-by: Sam Thursfield
Reviewed-by: Jim MacArthur
Reviewed-by: Richard Ipsum
| -rwxr-xr-x | ssh-rsync.write | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ssh-rsync.write b/ssh-rsync.write index 2391d48c..0ce89c7f 100755 --- a/ssh-rsync.write +++ b/ssh-rsync.write @@ -150,17 +150,17 @@ class SshRsyncWriteExtension(morphlib.writeexts.WriteExtension): self._created_orig_subvolume(location, remote_mnt, version_root) as orig: self.populate_remote_orig(location, orig, temp_root) - system_config_sync = os.path.join( - remote_mnt, 'systems', version_label, 'orig', - 'usr', 'bin', 'baserock-system-config-sync') - system_version_manager = os.path.join( - remote_mnt, 'systems', version_label, 'orig', - 'usr', 'bin', 'system-version-manager') + system_root = os.path.join(remote_mnt, 'systems', + version_label, 'orig') + config_sync = os.path.join(system_root, 'usr', 'bin', + 'baserock-system-config-sync') + version_manager = os.path.join(system_root, 'usr', 'bin', + 'system-version-manager') with self._deployed_version(location, version_label, - system_config_sync, system_version_manager): + config_sync, version_manager): self.status(msg='Setting %(v)s as the new default system', v=version_label) - cliapp.ssh_runcmd(location, [system_version_manager, + cliapp.ssh_runcmd(location, [version_manager, 'set-default', version_label]) if autostart: |