diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2013-06-19 15:50:51 +0100 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-06-19 15:50:51 +0100 |
commit | f5c2727bdb316c2b7640012d3b32abacde10fafa (patch) | |
tree | a3e1d634ec96f23669ecd854afa9f4d61f11da0a | |
parent | 875499bd04626c9eae15185341704e36aae18c43 (diff) | |
parent | f2392b7ebb07e23efc5c7f0fe551a87b1ce8ba62 (diff) | |
download | morph-f5c2727bdb316c2b7640012d3b32abacde10fafa.tar.gz |
Merge branch 'baserock/richardmaw/S8131-deploy-with-spaces' of git://git.baserock.org/baserock/baserock/morph
Reviewed by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
-rwxr-xr-x | morphlib/exts/kvm.write | 2 | ||||
-rwxr-xr-x | morphlib/exts/nfsboot.write | 4 | ||||
-rwxr-xr-x | morphlib/exts/ssh-rsync.write | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/morphlib/exts/kvm.write b/morphlib/exts/kvm.write index 52768042..67ac40e7 100755 --- a/morphlib/exts/kvm.write +++ b/morphlib/exts/kvm.write @@ -94,7 +94,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension): self.status(msg='Transferring disk image') target = '%s:%s' % (ssh_host, vm_path) with open(raw_disk, 'rb') as f: - cliapp.runcmd(['rsync', '-zS', raw_disk, target]) + cliapp.runcmd(['rsync', '-szS', raw_disk, target]) def create_libvirt_guest(self, ssh_host, vm_name, vm_path, autostart): '''Create the libvirt virtual machine.''' diff --git a/morphlib/exts/nfsboot.write b/morphlib/exts/nfsboot.write index f43d3c98..34a72972 100755 --- a/morphlib/exts/nfsboot.write +++ b/morphlib/exts/nfsboot.write @@ -118,7 +118,7 @@ class NFSBootWriteExtension(morphlib.writeexts.WriteExtension): rsync_dest = 'root@%s:%s' % (location, kernel_dest) self.status(msg='Copying kernel') cliapp.runcmd( - ['rsync', kernel_src, rsync_dest]) + ['rsync', '-s', kernel_src, rsync_dest]) # Link the kernel to the right place self.status(msg='Creating links to kernel in tftp directory') @@ -153,7 +153,7 @@ class NFSBootWriteExtension(morphlib.writeexts.WriteExtension): self.status(msg='Creating \'orig\' rootfs') cliapp.runcmd( - ['rsync', '-aXSPH', '--delete', rootfs_src, + ['rsync', '-asXSPH', '--delete', rootfs_src, 'root@%s:%s' % (location, orig_path)]) self.status(msg='Creating \'run\' rootfs') diff --git a/morphlib/exts/ssh-rsync.write b/morphlib/exts/ssh-rsync.write index 6bef51db..fba550cd 100755 --- a/morphlib/exts/ssh-rsync.write +++ b/morphlib/exts/ssh-rsync.write @@ -123,7 +123,7 @@ class SshRsyncWriteExtension(morphlib.writeexts.WriteExtension): cliapp.ssh_runcmd(location, ['mv', config, config+'~']) try: - cliapp.runcmd(['rsync', '-a', temp_file, + cliapp.runcmd(['rsync', '-as', temp_file, '%s:%s' % (location, config)]) except Exception as e: try: @@ -142,7 +142,7 @@ class SshRsyncWriteExtension(morphlib.writeexts.WriteExtension): cliapp.ssh_runcmd(location, ['btrfs', 'subvolume', 'snapshot', old_orig, new_orig]) - cliapp.runcmd(['rsync', '-a', '--checksum', '--numeric-ids', + cliapp.runcmd(['rsync', '-as', '--checksum', '--numeric-ids', '--delete', temp_root, '%s:%s' % (location, new_orig)]) def get_old_orig(self, location, remote_mnt): @@ -170,7 +170,7 @@ class SshRsyncWriteExtension(morphlib.writeexts.WriteExtension): for name in image_names: try_path = os.path.join(temp_root, 'boot', name) if os.path.exists(try_path): - cliapp.runcmd(['rsync', '-a', try_path, + cliapp.runcmd(['rsync', '-as', try_path, '%s:%s' % (location, kernel_dest)]) def check_valid_target(self, location): |