Changeset 10628 in hybrid

Timestamp:

May 1, 2012, 11:05:32 AM (13 years ago)

Author:

rick

Message:

Make sure to update the motd after file is downloaded to include the latest
version information.

File:

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

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

@@ -34 +34 @@
 FILES="authorized_keys dhcpd.conf dnsmasq.conf motd rc.conf.local resolv.conf wleiden.yaml"
 file_details() {
+  POST_CMD=""
+  FILE_HINT=""
+
   case "$1" in 
   'authorized_keys')
      STARTUP_LOC="/cfg/ssh/${FILE}"
      RUNNING_LOC="/etc/ssh/${FILE}"
-     FILE_HINT=""
    ;;
   'dhcpd.conf')
@@ -53 +55 @@
      STARTUP_LOC="/cfg/${FILE}"
      RUNNING_LOC="/etc/${FILE}"
-     FILE_HINT=""
+     POST_CMD="/etc/rc.d/motd onestart"
    ;;
   'named.conf')
@@ -68 +70 @@
      STARTUP_LOC="/cfg/${FILE}"
      RUNNING_LOC="/etc/${FILE}"
-     FILE_HINT=""
    ;;
    'wleiden.yaml')
      STARTUP_LOC="/cfg/local/${FILE}"
      RUNNING_LOC="/etc/local/${FILE}"
-     FILE_HINT=""
    ;;
   esac
@@ -163 +163 @@
   fetch -q -o ${TMPDIR}/node_list.txt ${BASEURL} || exit 1
   
-  # Provide Nodelist and feedback
-  cat ${TMPDIR}/node_list.txt | column
-  echo '       THIS script adds the config from GENESIS to this operating system'
-  echo '       make sure you know what you are doing, if not press control-C'
-  echo '       ENTER CONFIG NAME  ......(and press enter)'
-
   if [ ${OPT_BATCH} -eq 1 ]; then
     config_validator "${CONFIG}"
@@ -176 +170 @@
    fi
   else
+    # Provide Nodelist and feedback
+    cat ${TMPDIR}/node_list.txt | column
+    echo '       THIS script adds the config from GENESIS to this operating system'
+    echo '       make sure you know what you are doing, if not press control-C'
+    echo '       ENTER CONFIG NAME  ......(and press enter)'
+
     # Have the user to select the right node
     INVALID_CONFIG=1
@@ -203 +203 @@
   SOURCE=$1
   TARGET=$2
-  diff -I '^# Generated at ' ${TARGET} ${SOURCE} 2>/dev/null
+  diff -I '^FreeBSD ' -I '^# Generated at ' ${TARGET} ${SOURCE} 2>/dev/null
   if [ $? -ne 0 ]; then
     mkdir -p `dirname ${TARGET}` || exit 1
@@ -256 +256 @@
       if [ $? -eq 0 ]; then
         echo "# INFO: '${FILE}' changed"  
+        if [ -n "${POST_CMD}" ]; then
+          echo "## Running post_cmd: $POST_CMD"
+          $POST_CMD
+        fi
         if [ -n "${FILE_HINT}" ]; then
           echo "# INFO: For instant activate: ${FILE_HINT}"