diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-24 16:24:49 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-24 16:29:22 +0000 |
commit | 91254a588f81c9b829a2eecfbfe8f0981248f51d (patch) | |
tree | 7951c75a1461c32939299dd5277b6e6e60faaf3b /morphlib/exts | |
parent | c7a4b52dc254cbe8b8db28926d3d36f72c4f4197 (diff) | |
download | morph-91254a588f81c9b829a2eecfbfe8f0981248f51d.tar.gz |
Be consistent with nfsboot_root path
We were building it from a variable in some places and hardcoding it in
others; now we build it from a variable everywhere.
Diffstat (limited to 'morphlib/exts')
-rwxr-xr-x | morphlib/exts/nfsboot.check | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/morphlib/exts/nfsboot.check b/morphlib/exts/nfsboot.check index e240dd72..f84f187f 100755 --- a/morphlib/exts/nfsboot.check +++ b/morphlib/exts/nfsboot.check @@ -80,12 +80,13 @@ class NFSBootCheckExtension(morphlib.writeexts.WriteExtension): 'nfs server by systemd' % server) # TFTP server exports /srv/nfsboot/tftp + tftp_root = os.path.join(self._nfsboot_root, 'tftp') try: cliapp.ssh_runcmd( - 'root@%s' % server, ['test' , '-d', '/srv/nfsboot/tftp']) + 'root@%s' % server, ['test' , '-d', tftp_root]) except cliapp.AppException: - raise cliapp.AppException('server %s does not export ' - '/srv/nfsboot/tftp' % server) + raise cliapp.AppException('server %s does not export %s' % + (tftp_root, server)) def version_exists(self, versioned_root, location): try: |