lots of fixes

[distro-setup] / demohost-mount

diff --git a/demohost-mount b/demohost-mount
index 6445187dc16d5288d1c4d414a566f2c6e4f728f8..8dc062012b4cd45d63eb2c22563cb0c30c2d7a90 100755 (executable)
--- a/demohost-mount
+++ b/demohost-mount
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
@@ -9,11 +9,11 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 
 ip=$(host demohost | sed -rn 's/^\S+ has address //p;T;q')/32
-cedit demohost /etc/exports <<EOF
+cedit demohost /etc/exports <<EOF || exportfs -ra
 /a $ip(async,rw,no_subtree_check,no_root_squash)
 /q $ip(async,rw,no_subtree_check,no_root_squash)
 EOF
-exportfs -ra
+
 
 ssh root@demohost bash -s <<'EOFOUTER'
 set -eE -o pipefail