various fixes and improvements

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

diff --git a/myfai-chboot-local b/myfai-chboot-local
index 6d7e019607869a4ecfff4a12feab8807caf38acb..d16f3b14961bb6cc9163f1a428496d7b86ade3cc 100755 (executable)
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -34,18 +34,23 @@ host=$1
 # assuming ipv4, or else we might need to deal with multiple addresses
 # in an ipv4 + ipv6 network.
 my_ip=$(ip -4 route get 8.8.8.8 | sed -nr 's,^.*src\s+(\S+).*,\1,p')
-if [[ $x =~ [[:space:]] ]]; then
+if [[ ! $my_ip || $my_ip =~ [[:space:]] ]]; then
     echo "$0: error: failed to get \$my_ip, got: $my_ip"
     exit 1
 fi
 
 if [[ $host == default ]]; then
-    ip=$network
+    ip='*'
 elif [[ $host == [0-9]*.[0-9]*.[0-9]*.[0-9]* ]]; then
-    ip=$host
+    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
+    if [[ ! $ip || $ip =~ [[:space:]] ]]; then
+        echo "$0: error: failed to get \$my_ip, got: $my_ip"
+        exit 1
+    fi
+
 fi
 
 if modprobe nfsd &>/dev/null; then