Changeset 10917 in hybrid

Timestamp:

May 19, 2012, 4:31:06 PM (13 years ago)

Author:

rick

Message:

POST_CMD is a bit to advanced for our good, make sure to have the user
specify it before doing it.

While here; Make sure we do not mount when we are virtually mounted (e.g. pre-config image).

File:

• branches/releng-9.0/nanobsd/files/tools/wl-config (modified) (7 diffs)

branches/releng-9.0/nanobsd/files/tools/wl-config

@@ -45 +45 @@
      STARTUP_LOC="/cfg/local/${FILE}"
      RUNNING_LOC="/usr/local/etc/${FILE}"
-     FILE_HINT="service isc-dhcpd restart"
+     POST_CMD="service isc-dhcpd restart"
    ;;
   'dnsmasq.conf')
      STARTUP_LOC="/cfg/local/${FILE}"
      RUNNING_LOC="/usr/local/etc/${FILE}"
-     FILE_HINT="service dnsmasq restart"
+     POST_CMD="service dnsmasq restart"
    ;;
    'motd')
@@ -60 +60 @@
      STARTUP_LOC="/cfg/namedb/${FILE}"
      RUNNING_LOC="/etc/namedb/${FILE}"
-     FILE_HINT="service named restart"
+     POST_CMD="service named restart"
    ;;
   'rc.conf.local')
      STARTUP_LOC="/cfg/${FILE}"
      RUNNING_LOC="/etc/${FILE}"
-     FILE_HINT="service netif restart"
+     FILE_HINT="Restart interfaces with: nohup service netif restart"
    ;;
    'resolv.conf')
      STARTUP_LOC="/cfg/${FILE}"
      RUNNING_LOC="/etc/${FILE}"
+     FILE_HINT="To get the ordering right run: nameserver-shuffle"
    ;;
    'pf.hybrid.conf.local')
@@ -85 +86 @@
 usage() {
         (
-        echo "Usage: $0 [-bn] [-c <config>] [-m <all|startup|testing|running>]"
+        echo "Usage: $0 [-bpn] [-c <config>] [-m <all|startup|testing|running>]"
         echo "  -b          = batch mode, no user input"
         echo "  -c <config> = default configuration to fetch"
-        echo "  -d          = do not run the POST_CMD commands"
+        echo "  -d          = do not run the POST_CMD commands [default]"
+        echo "  -p          = run the POST_CMD commands to activate the services right-away"
         echo "  -n          = do not mount config partition"
         echo "  -m all      = copy config files to running & config partition [default]"
@@ -106 +108 @@
 OPT_HACK=0              # Hack for people without configuration managment and testing
 OPT_BATCH=0
-OPT_POSTCMD=true
+OPT_POSTCMD=false
 
 parse_options() {
-  while getopts "bc:nm:d" OPT; do
+  while getopts "bc:nm:dp" OPT; do
         case "$OPT" in
         b) OPT_BATCH=1;;
@@ -124 +126 @@
            esac;;
         h) usage;;
+        p) OPT_POSTCMD=true;;
         \?) usage;;
         esac
@@ -143 +146 @@
     echo "# WARN: Copy running configuration to startup configuration"
     echo "# WARN: Please do mind to document/mention this changes somewhere"
+  fi
+
+  if /bin/df / | grep -q "^/dev/md[0-9]"; then
+    OPT_MOUNT=0
+    echo "# WARN: Mount operations disabled as we are running in a md(4) image"
   fi
 
@@ -264 +272 @@
       if [ $? -eq 0 ]; then
         echo "# INFO: '${FILE}' changed"  
-        if $OPT_POSTCMD && [ -n "${POST_CMD}" ]; then
-          echo "## Running post_cmd: $POST_CMD"
-          $POST_CMD
+        if [ -n "${POST_CMD}" ]; then
+          if $OPT_POSTCMD; then
+            echo "## Running post_cmd: $POST_CMD"
+            $POST_CMD
+          else
+            echo "## To activate run the post_cmd: $POST_CMD"
+          fi
         fi
         if [ -n "${FILE_HINT}" ]; then
-          echo "# INFO: For instant activate: ${FILE_HINT}"
+          echo "# INFO: ${FILE_HINT}"
           echo ""
         fi