Changeset 14164 in hybrid for branches/releng-11/nanobsd

Timestamp:

May 9, 2018, 9:43:34 AM (7 years ago)

Author:

rick

Message:

Fix failure on definition of multiple nameservers

If /etc/resolv.conf contains multiple identical nameservers the script will
bail out due to multiple matches with grep and awk. Making script more robust
by adding uniqueness checking.

File:

• branches/releng-11/nanobsd/files/tools/nameserver-shuffle (modified) (3 diffs)

branches/releng-11/nanobsd/files/tools/nameserver-shuffle

@@ -28 +28 @@
 # Get enabled DYNAMIC LIST nameservers
 sed "1,\+$TAG+d" /etc/resolv.conf > $DYNLIST || exit 1
-NAMESERVERS=`awk '/^nameserver/ {print $2}' $DYNLIST` || exit 1
+NAMESERVERS=`awk '/^nameserver/ {print $2}' $DYNLIST | sort -u` || exit 1
 
 # Only do something if we have dynamic nameservers
@@ -48 +48 @@
   
   # Output sorted list
-  NAMESERVERS=`sort -n $RESULTLIST | awk '{print $2}'`
+  NAMESERVERS=`sort -n $RESULTLIST | uniq -f 1 | awk '{print $2}'`
   for NAMESERVER in $NAMESERVERS; do
-    QUERY_TIME=`grep "${NAMESERVER}$" $RESULTLIST | cut -d' ' -f1`
-    [ $QUERY_TIME = "9999" ] && STATUS="Query time: down" || STATUS="Query time: $QUERY_TIME"
+    QUERY_TIME=`grep -m 1 "${NAMESERVER}$" $RESULTLIST | cut -d' ' -f1`
+    [ "$QUERY_TIME" = "9999" ] && STATUS="Query time: down" || STATUS="Query time: $QUERY_TIME"
     # awk magic to get maximum length of comment field (for display purposes).
     ML=`awk '/^nameserver/ {l=length($4);if (l>ml){ml=l}}END{print ml}' $DYNLIST`
@@ -67 +67 @@
 
   # Update unbound forwarders list
-  unbound-control forward $(awk '/^nameserver 172/ {print $2}' /etc/resolv.conf | head -3)
+  unbound-control forward $(awk '/^nameserver 172/ {print $2}' /etc/resolv.conf | uniq | head -3)
 fi