Changeset 10409 in hybrid

Timestamp:

Apr 9, 2012, 10:49:47 AM (13 years ago)

Author:

rick

Message:

Allow fetching the dhcpd.conf files and make sure to diff the proper way...

File:

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

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

@@ -32 +32 @@
 # Determine it's statup and running location and some other hints
 # Skip named.conf as it not planned in current release
-FILES="authorized_keys dnsmasq.conf rc.conf.local resolv.conf wleiden.yaml"
+FILES="authorized_keys dhcpd.conf dnsmasq.conf rc.conf.local resolv.conf wleiden.yaml"
 file_details() {
   case "$1" in 
@@ -40 +40 @@
      FILE_HINT=""
    ;;
+  'dhcpd.conf')
+     STARTUP_LOC="/cfg/local/${FILE}"
+     RUNNING_LOC="/etc/local/${FILE}"
+     FILE_HINT="service isc-dhcpd restart"
+   ;;
   'dnsmasq.conf')
      STARTUP_LOC="/cfg/local/${FILE}"
      RUNNING_LOC="/etc/local/${FILE}"
-     FILE_HINT="/usr/local/etc/rc.d/dnsmasq restart"
+     FILE_HINT="service dnsmasq restart"
    ;;
   'named.conf')
      STARTUP_LOC="/cfg/namedb/${FILE}"
      RUNNING_LOC="/etc/namedb/${FILE}"
-     FILE_HINT="/etc/rc.d/named restart"
+     FILE_HINT="service named restart"
    ;;
   'rc.conf.local')
      STARTUP_LOC="/cfg/${FILE}"
      RUNNING_LOC="/etc/${FILE}"
-     FILE_HINT="/etc/rc.d/netif restart"
+     FILE_HINT="service netif restart"
    ;;
    'resolv.conf')
@@ -193 +198 @@
   SOURCE=$1
   TARGET=$2
-  diff -I '^# Generated at ' ${SOURCE} ${TARGET} 2>/dev/null
+  diff -I '^# Generated at ' ${TARGET} ${SOURCE} 2>/dev/null
   if [ $? -ne 0 ]; then
     mkdir -p `dirname ${TARGET}` || exit 1