small fixes

[automated-distro-installer] / myfai-chboot-local

diff --git a/myfai-chboot-local b/myfai-chboot-local
index 58babc14c750e088c4fd25cf0cd7bc08a81898be..6d7e019607869a4ecfff4a12feab8807caf38acb 100755 (executable)
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -31,36 +31,28 @@ e() {
 
 host=$1
 
-type -t host &>/dev/null || apt-get -y install dnsutils
-gateway_if=$(ip route | sed -rn 's/^default via \S+ dev (\S+) .*/\1/p')
-if [[ ! $gateway_if ]]; then
-    echo "$0: failed to find gateway interface"
-    exit 1
-fi
 # assuming ipv4, or else we might need to deal with multiple addresses
 # in an ipv4 + ipv6 network.
-network=$(ip -4 -o a show dev $gateway_if | sed -rn '/scope.*global/s/^(\S+\s+){3}(\S+)\s.*/\2/p')
-if [[ ! $network ]]; then
-    echo "$0: failed to find network"
+my_ip=$(ip -4 route get 8.8.8.8 | sed -nr 's,^.*src\s+(\S+).*,\1,p')
+if [[ $x =~ [[:space:]] ]]; then
+    echo "$0: error: failed to get \$my_ip, got: $my_ip"
     exit 1
 fi
-my_ip=${network%/*}
+
 if [[ $host == default ]]; then
     ip=$network
 elif [[ $host == [0-9]*.[0-9]*.[0-9]*.[0-9]* ]]; then
     ip=$host
 else
+    type -t host &>/dev/null || apt-get -y install dnsutils
     ip=$(host $host | sed -rn 's/^\S+ has address //p;T;q')/32
 fi
 
-
-# alternate way of getting my ip
-#gateway_ip=$(ip route | sed -rn 's/^default via (\S+) .*/\1/p')
-#my_ip=$(host faiserver $gateway_ip | sed -rn 's/^\S+ has address //p;T;q')
-
 if modprobe nfsd &>/dev/null; then
     std_arg="-u nfs://faiserver/srv/fai/config"
-    root_arg="$my_ip:/srv/fai/nfsroot"
+    # nfsv4 wont do rw with overlayfs yet
+    # https://lists.uni-koeln.de/pipermail/linux-fai/2017-March/011641.html
+    root_arg="$my_ip:/srv/fai/nfsroot:vers=3"
     # fai-setup without -e sets the ip to the local_ip/local_network, eg 192.168.1.3/24
     # I restrict it to one ip as simple but imperfect access control.
     sed -ri --follow-symlinks '\%^/srv/fai/%d' /etc/exports
@@ -69,6 +61,7 @@ if modprobe nfsd &>/dev/null; then
 /srv/fai/nfsroot $ip(async,ro,no_subtree_check,no_root_squash)
 EOF
     exportfs -ra
+    systemctl start nfs-server # assumes recent os
 else
     std_arg="-u http://faiserver:8080/config.tar.gz"
     root_arg="live:http://faiserver:8080/squash.img"