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

Timestamp:

Nov 2, 2005, 5:43:32 PM (19 years ago)

Author:

rick

Message:

Minor bug fixes and RO/RW automation

File:

• tools/config-node.sh (modified) (9 diffs, 1 prop)

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.
 #
 # If there is a global system configuration file, suck it in.
@@ -22 +23 @@
 HTTP_PROXY_DEFAULT=${HTTP_PROXY:-http://proxy.wleiden.net:3128}
 HTTP_USER_AGENT=${HTTP_USER_AGENT:-curl.faked.fetch/0.0}
-VERSION=1.03
+VERSION=1.04
 QUIET=${QUIET:-}
 PRETEND=no
+FORCE=no
 
 FETCH=${FETCH:-/usr/bin/fetch}
@@ -42 +44 @@
         echo "-n                Show what would happen - but do not do it"
         echo "-q                Suppress all output and user interaction"
+        echo "-F                Force disk to write"
         exit 1
 }
@@ -66 +69 @@
                         PRETEND=yes
                         ;;
+                -F)
+                        FORCE=yes
+                        ;;
                 *)
                         test $# -eq 1 || usage
@@ -75 +81 @@
 done
 
+echo Config Node -- Version: $VERSION '$Rev$'
+
+# Make sure we clean up our mess when needed.
+trap "rm -f ${TMPPREFIX}.?; echo Failed; exit 1;" 2 3
+
+if [ ${PRETEND} != 'yes' ]; then
+        if mount | grep "on / " | grep -q read-only; then
+                if [ ${FORCE} = "yes" ]; then
+                        echo Forcing read-only disk into rw.
+                        fsck / || exit 2
+                        mount -o noatime -u -w / || exit 2 || exit 1
+                        trap "mount -u -r /; rm -f ${TMPPREFIX}.?; echo Failed; exit 1;" 2 3
+                        FORCE=rw
+                else
+                        echo ERROR - disk / is mounted read only. Aborting.
+                        exit 1
+                fi
+        fi
+fi
+
 export HTTP_USER_AGENT
 export TMPDIR
@@ -85 +111 @@
 lcd=${LCDIR:-/lcd}
 
-# Make sure we clean up our mess when needed.
-trap "rm -f ${TMPPREFIX}.?; echo Failed; exit 1;" 2 3
 
 # connection test function
@@ -253 +277 @@
    fi
 
-   test -e $symdir/$file || echo WARNING: Symlink $symdir/$file not in place.
+   test -e $symdir/$file || (
+                echo WARNING: Symlink $symdir/$file not in place.
+                echo use:   ln -s $dir/$file $symdir/$file  
+                echo to fix if appropriate.
+        )
 }
 
 dir=${lcd}
 
-echo Config Node -- Version: $VERSION
 
 #check config dir
@@ -331 +358 @@
                 ;; 
         resolv.conf | rc.node.local | rc.local)
-                linkin /etc/ ${i}
+                linkin /etc ${i}
                 ;;
         snmpd.local.conf)
-                linkin /usr/local/share/snmp/ ${i}
+                linkin /usr/local/share/snmp ${i}
                 ;;
         named.conf)
-                linkin/etc/namedb/ ${i}
+                linkin /etc/namedb ${i}
                 ;;
         dhcpd.conf)
-                linkin /usr/local/etc/ ${i}
+                linkin /usr/local/etc ${i}
                 ;;
         zebra.conf | ospfd.conf)
-                linkin /usr/local/etc/zebra/ ${i}
+                linkin /usr/local/etc/zebra ${i}
                 ;;
         authorized_keys)
@@ -403 +430 @@
 fi
 
+test ${FORCE} = 'rw' && mount -u -r /
 exit 0