X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=chost;h=a26529fee9efbeaf3a14632946d59d4e84d7bc8d;hp=77e17d467b3447468c59b832efbd3da893e59b06;hb=HEAD;hpb=1885f9677fdf2bfeac95285cf13a7d60273d096a

diff --git a/chost b/chost
index 77e17d4..204637b 100755
--- a/chost
+++ b/chost
@@ -7,6 +7,17 @@ set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 host=$1
-addr=$(getent hosts $host | awk '{print $1}')
-h=$(getent hosts $addr | awk '{print $2}')
-echo ${h%%.*}
+# ||: because if we are using 2+ resolvers, 1 may fail, causing error, but we still get
+# a valid address and we just use that
+addr=$(host $host | sed -rn 's/^\S+ has address //p;T;q' ||:)
+h=$(host $addr)
+case $h in
+  *"no PTR record")
+    echo "error: chost: $h" >&2
+    exit 1
+    ;;
+esac
+h=${h##* }
+# trailing dot in a hostname will mess up rsync
+h=${h%.}
+echo $h