X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=myfai-chboot-local;h=b2df864f129e32cbb2a1fdc5202192c115956b5d;hb=f0d1a07f2c696d1aace04763424fc6ad13751fb3;hp=c990fdf39456b179549bab45ebe0d8e28f1f31f3;hpb=d29d21017de635db1d05769144db56f44addd055;p=automated-distro-installer

diff --git a/myfai-chboot-local b/myfai-chboot-local
index c990fdf..b2df864 100755
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+# note, this script gets piped to bash, so cant cd to current dir
+set -eE -o pipefail
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+
 
 fai_action_arg=I
 fai_reboot_arg=,reboot
@@ -18,46 +21,58 @@ esac
 
 [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
 
-e() { echo "$@"; "$@"; }
+e() {
+    echo "$*"
+    if ! "$@"; then
+        echo "$0: error: exit code $? from: $*"
+        exit 1
+    fi
+}
 
 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 [[ ! $my_ip || $my_ip =~ [[: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
+    ip='*'
+elif [[ $host == [0-9]*.[0-9]*.[0-9]*.[0-9]* ]]; then
+    ip=$host/32
 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
-
+    if [[ ! $ip || $ip =~ [[:space:]] ]]; then
+        echo "$0: error: failed to get \$my_ip, got: $my_ip"
+        exit 1
+    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')
+fi
 
 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
-    cat >>/etc/exports <<EOF
+
+    # we may chattr +i /etc/exports if we dun want it modified
+    # for example, if we made these exports more widely available
+    # while doing multiple installs or a recovery.
+    if [[ -w /etc/exports ]]; then
+        sed -ri --follow-symlinks '\%^/srv/fai/%d' /etc/exports
+        cat >>/etc/exports <<EOF
 /srv/fai/config $ip(async,ro,no_subtree_check)
 /srv/fai/nfsroot $ip(async,ro,no_subtree_check,no_root_squash)
 EOF
-    exportfs -ra
+        exportfs -ra
+    fi
+    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"