Changeset 5003 in genesis

Timestamp:

Nov 5, 2005, 11:59:44 PM (19 years ago)

Author:

dirkx

Message:

Checks version and diff details

File:

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

tools/config-node.sh

@@ -199 +199 @@
         url=$1
         file=$2
-        ${FETCH} -o - ${link}${nodename} > ${TMPPREFIX}.x \
+        ${FETCH} -o - ${url} > ${TMPPREFIX}.x \
                     || cleanexit 1
 
@@ -213 +213 @@
         fi
 
-        cp ${TMPPREFIX}.x ${dir}/${list} \
+        cp ${TMPPREFIX}.x ${file} \
             || cleanexit 1
         rm -f ${TMPPREFIX}.x
@@ -223 +223 @@
 {
         log Fetching list of nodes from ${link}
-        ${FETCH} -o - ${link} > ${nlist} || cleanexit 1
+        safefetch ${link} ${nlist} || cleanexit 1
 }
 
@@ -255 +255 @@
 do_diff() {
         if test -e $lcd/$1; then
-                diff -uwbB $lcd/$1 $1.new
+                diff -uwbB $lcd/$1 $dir/$1.new
         else
                 echo Warning: $lcd/$1 does not yet exist - no DIFF
@@ -262 +262 @@
 
 do_move() {
-if [ -e $1 ]; then
-        mv $1 $1.bak  || cleanexit 1
-fi
-cp $1.new $1 || cleanexit 1
-rm $1.new || cleanexit 1
+        if [ -e $dir/$1 ]; then
+                mv $dir/$1 $dir/$1.bak  || cleanexit 1
+        fi
+        cp $dir/$1.new $dir/$1 || cleanexit 1
+        rm $dir/$1.new || cleanexit 1
 }
 
@@ -276 +276 @@
         echo "** $CMD $*"
    else
-        $CMD $dir/$file || exit 1
+        $CMD $file || exit 1
    fi
 
@@ -291 +291 @@
 trap "rm -f ${TMPPREFIX}.?; echo Failed; exit 1;" 2 3
 
-if [ ${PRETEND} != 'yes' ]; then
+if [ ${PRETEND} != 'yes' -a ${CMD} != 'do_diff' ]; then
         if mount | grep "on / " | grep -q read-only; then
                 if [ ${FORCE} = "yes" ]; then
@@ -322 +322 @@
                 log Checking if ${HOST} can be reached
                 ping -qnoc 1 ${HOST} > /dev/null || exit 1
-                log Connection OK
+                log Connection: Ok
                 exit 0
         ) || connset
@@ -363 +363 @@
 done
 
-log Checking release and OS versions
-
-safefetch ${link}${nodename}/info > $dir/${i} \
+lognlr "Checking release and OS versions: "
+
+safefetch ${link}${nodename}/info $dir/info.last \
         || cleanexit 1
 
 OS=`uname -s`
 REL=`uname -r`
-set `head -1 $dir/${i}
+set -- `head -1 $dir/info.last`
+
 # FreeBSD 5.0-RELEASE 1 YES
 if [ $# != 4 ]; then
@@ -376 +377 @@
         cleanexit 1
 fi
-if [ $4 -ne 'YES' ]; then
+if [ x$4 != 'xYES' ]; then
         echo Genesis marked as disabled for this machine.
         test -z ${DLV} || cleanexit 1
 fi
-if [ $3 -ne $VERSION_MAJOR' ]; then
+if [ 0$3 -ne $VERSION_MAJOR ]; then
         echo This script is version $VERSION, genesis info is for version $3.xx
         test -z ${DLV} || cleanexit 1
 fi
-if [ $1 -ne $OS ]; then
+if [ x$1 != x$OS ]; then
         echo Operating system mismatch; this machine: $OS, but config is for $1
         test -z ${DLV} || cleanexit 1
 fi
-if [ $2 -ne $REL ]; then
+if [ x$2 != x$REL ]; then
         echo This machine runs $REL, but the configuration is for $2
         test -z ${DLV} || cleanexit 2
 fi
+
+log Ok
 
 log Fetching file list from $link for $nodename
@@ -401 +404 @@
 do
   lognlr " ${i}"
-  $FETCH -o - ${link}${nodename}/${i} > ${dir}/${i}.new \
-    || cleanexit 1
+#  $FETCH -o - ${link}${nodename}/${i} > ${dir}/${i}.new || cleanexit 1
+   safefetch ${link}${nodename}/${i} ${dir}/${i}.new 
 done
 log .
@@ -469 +472 @@
 fi
 
-if [ -r  /etc/namedb/make-localhost ]; then
+if [ -r  /etc/namedb/make-localhost -a ${CMD} != 'do_diff'  ]; then
   (
     cd /etc/namedb || exit 1