summaryrefslogtreecommitdiff
path: root/morphlib/exts
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-04-12 10:28:57 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-04-12 10:28:57 +0000
commitf8f6fde02bb09f4e9aa8fb4fc769edf7a221078c (patch)
tree25f35015030231b9f047efe2394eefd68425fe42 /morphlib/exts
parente987e8904febc6213d1a329a8dbd00c2f795b2ac (diff)
parent2b7803f57ebde9c8647aeddd68d136b8c93e18d7 (diff)
downloadmorph-f8f6fde02bb09f4e9aa8fb4fc769edf7a221078c.tar.gz
Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph
Diffstat (limited to 'morphlib/exts')
-rwxr-xr-xmorphlib/exts/nfsboot.write6
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/exts/nfsboot.write b/morphlib/exts/nfsboot.write
index 60b4d00d..293b1acf 100755
--- a/morphlib/exts/nfsboot.write
+++ b/morphlib/exts/nfsboot.write
@@ -111,8 +111,8 @@ class NFSBootWriteExtension(morphlib.writeexts.WriteExtension):
exports_string = '%s %s(%s)\n' % (rootfs_dest, ip_mask, options)
exports_append_sh = '''\
set -eu
-target = "$1"
-temp = $(mktemp)
+target="$1"
+temp=$(mktemp)
cat "$target" > "$temp"
cat >> "$temp"
mv "$temp" "$target"
@@ -122,7 +122,7 @@ mv "$temp" "$target"
['sh', '-c', exports_append_sh, '--', exports_path],
feed_stdin=exports_string)
cliapp.ssh_runcmd(
- 'root@%s' % location, ['systemctl', 'reload',
+ 'root@%s' % location, ['systemctl', 'restart',
'nfs-server.service'])
def test_good_server(self, server):