Changeset 4990 in genesis for tools/config-node.sh

Timestamp:

Nov 2, 2005, 11:45:23 PM (19 years ago)

Author:

dirkx

Message:

+Cope with whost having port numbers

File:

• tools/config-node.sh (modified) (7 diffs)

tools/config-node.sh

@@ -12 +12 @@
 #       file list, check node name to be valid, '-n' mode.
 #       make moving of final files a bit safer. (dirkx)
-# 1.04  Add auto read-only detection.
+# 1.04  Add auto read-only detection. (dirkx)
+# 1.05  Cope with WHOST containing a port number. (dirkx).
 #
 # If there is a global system configuration file, suck it in.
@@ -23 +24 @@
 HTTP_PROXY_DEFAULT=${HTTP_PROXY:-http://proxy.wleiden.net:3128}
 HTTP_USER_AGENT=${HTTP_USER_AGENT:-curl.faked.fetch/0.0}
-VERSION=1.04
+VERSION=1.05
 QUIET=${QUIET:-}
 PRETEND=no
@@ -96 +97 @@
 
 
+HOST=`echo ${WHOST} | sed -e 's/:.*//'`
 
 # connection test function
@@ -130 +132 @@
         echo "nameserver ${resolver}" > /etc/resolv.conf
 
+
         for nic in `ifconfig -l`
         do
@@ -136 +139 @@
                 ;;
         *) 
-                if ping -qnoc ${WHOST}; then
-                        echo Connection on interface ${nic} ok
+                if ping -qnoc ${HOST}; then
+                        echo Connection on interface ${nic} to ${HOST} ok.
                 else
                         killall dhclient
@@ -241 +244 @@
 
 do_diff() {
-        diff -uwbB $1 $1.new
+        if test -e $1; then
+                diff -uwbB $1 $1.new
+        else
+                echo Warning: $1 does not yet exist - no DIFF
+        fi
 }
 
@@ -300 +307 @@
 
 if [ -z ${HTTP_PROXY} ]; then
-  (
-    log Checking DNS for ${WHOST}
-    host ${WHOST} > /dev/null || exit 1
-    log Checking if ${WHOST} can be reached
-    ping -qnoc 1 ${WHOST} > /dev/null || exit 1
-    log Connection OK
-    exit 0
-  ) || connset
+        (
+                log Checking DNS for ${HOST}
+                host ${HOST} > /dev/null || exit 1
+                log Checking if ${HOST} can be reached
+                ping -qnoc 1 ${HOST} > /dev/null || exit 1
+                log Connection OK
+                exit 0
+        ) || connset
+else
+        log Connection not checked because there is an http proxy configured: ${HTTP_PROXY}.
 fi