diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-04-20 15:28:57 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-04-20 15:28:57 +0000 |
| commit | ae2d4718159085f4a7574adb20c280c1874c58b0 (patch) | |
| tree | b29b293e8d695c0fd9d1e4cbc17fe723da9c4d2d | |
| parent | 17884c883819fa7601b1524d47b518178093f45d (diff) | |
| download | morph-sam/distbuild-nfsboot.write.tar.gz | |
Change-Id: I7c89d0ea096e967241db8b1aa01e6a5eeefa87f2
| -rwxr-xr-x | morphlib/exts/distbuild-trove-nfsboot.write | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/morphlib/exts/distbuild-trove-nfsboot.write b/morphlib/exts/distbuild-trove-nfsboot.write index df340421..6a05cf3d 100755 --- a/morphlib/exts/distbuild-trove-nfsboot.write +++ b/morphlib/exts/distbuild-trove-nfsboot.write @@ -122,8 +122,9 @@ class DistbuildTroveNFSBootWriteExtension(morphlib.writeexts.WriteExtension): # The deployed rootfs may have been created by OSTree, so definitely # don't pass --hard-links to `rsync`. cliapp.runcmd( - ['rsync', '--archive', '--info=progress2', '--protect-args', - '--partial', '--sparse', '--xattrs', local_system_path + '/', + ['rsync', '--archive', '--delete', '--info=progress2', + '--protect-args', '--partial', '--sparse', '--xattrs', + local_system_path + '/', '%s:%s' % (nfs_netloc, remote_system_path)], stdout=sys.stdout) def duplicate_remote_system(self, nfs_netloc, source_system_path, @@ -137,8 +138,8 @@ class DistbuildTroveNFSBootWriteExtension(morphlib.writeexts.WriteExtension): # versions of Baserock have RSync 3.0.9. So the user doesn't get any # progress info on stdout for the 'duplicate' stage. cliapp.ssh_runcmd(nfs_netloc, - ['rsync', '--archive', '--protect-args', '--partial', '--sparse', - '--xattrs', source_system_path + '/', + ['rsync', '--archive', '--delete', '--protect-args', '--partial', + '--sparse', '--xattrs', source_system_path + '/', target_system_path], stdout=sys.stdout) def find_kernel(self, local_system_path): @@ -163,7 +164,8 @@ class DistbuildTroveNFSBootWriteExtension(morphlib.writeexts.WriteExtension): remote_system_path = self.system_path(system_name, version_label) kernel_dest = os.path.join(remote_system_path, kernel_relpath) - self.status(msg='Creating links to kernel in tftp directory') + self.status(msg='Creating links to %(name)s kernel in tftp directory', + name=system_name) tftp_dir = os.path.join(self.nfsboot_root , 'tftp') versioned_kernel_name = "%s-%s" % (system_name, version_label) |