Changeset 10722 in hybrid for branches/releng-9.0

Timestamp:

May 8, 2012, 5:36:48 PM (13 years ago)

Author:

rick

Message:

During image building config do not run the POST_CMD commands.

Running and running them in chroot highly confuses the system.

Location:

branches/releng-9.0/nanobsd

Files:

• files/tools/wl-config (modified) (3 diffs)
• tools/config-image.sh (modified) (1 diff)

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

@@ -88 +88 @@
         echo "  -b          = batch mode, no user input"
         echo "  -c <config> = default configuration to fetch"
+        echo "  -d          = do not run the POST_CMD commands"
         echo "  -n          = do not mount config partition"
         echo "  -m all      = copy config files to running & config partition [default]"
@@ -105 +106 @@
 OPT_HACK=0              # Hack for people without configuration managment and testing
 OPT_BATCH=0
+OPT_POSTCMD=true
 
 parse_options() {
-  while getopts "bc:nm:" OPT; do
+  while getopts "bc:nm:d" OPT; do
         case "$OPT" in
         b) OPT_BATCH=1;;
         c) CONFIG="${OPTARG}";;
+        d) OPT_POSTCMD=false;;
         n) OPT_MOUNT=0;;
         m) case "$OPTARG" in
@@ -261 +264 @@
       if [ $? -eq 0 ]; then
         echo "# INFO: '${FILE}' changed"  
-        if [ -n "${POST_CMD}" ]; then
+        if $OPT_POSTCMD && [ -n "${POST_CMD}" ]; then
           echo "## Running post_cmd: $POST_CMD"
           $POST_CMD

branches/releng-9.0/nanobsd/tools/config-image.sh

@@ -42 +42 @@
 
 # Try to fetch and store config
-chroot ${MNT} /tools/wl-config -n -m startup
+chroot ${MNT} /tools/wl-config -d -n -m startup
 
 # Clean up