implemented a do not touch for dhcp config and a config action

diff --git a/debian/changelog b/debian/changelog
index 7c9f48d..e738bd4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,12 @@ grml-terminalserver (0.68) unstable; urgency=low
   * fixed bug in dhcp-config template
   * fixed bug with false NETWORK_
   * changed configfile layout (still fully compatibel to older versions)
-  * fixed bug with not stopping portmapper (additional killall -9) 
+  * fixed bug with not stopping portmapper (additional killall -9)
+  * implemented a "do not touch" for dhcp config (if user removes the line,
+    grml-terminalserver won't touch this configfile anymore).
+  * added config action to grml-terminalserver to update configs.
 
- -- Michael Gebetsroither <michael.geb@gmx.at>  Sat, 19 Nov 2005 10:56:16 +0100
+ -- Michael Gebetsroither <michael.geb@gmx.at>  Sat, 19 Nov 2005 11:26:01 +0100
 
 grml-terminalserver (0.67) unstable; urgency=low
 

diff --git a/grml-terminalserver b/grml-terminalserver
index d69a3e5..61c4461 100755 (executable)
--- a/grml-terminalserver
+++ b/grml-terminalserver
@@ -42,8 +42,9 @@ comming with grml.
 
 COMMANDS:
    help             This help text
-   start <service>  Start services
+   start <service>  Start services (if all services are started, configs will be updated)
    stop <service>   Stop services
+   config <service> Update config of given service (or from all if no services given)
    clean            Stop all + remove config and boot files from services
    <default>        interactive
 
@@ -62,21 +63,34 @@ EOT
 
 function killPortmapper
 {
-    /etc/init.d/portmap stop >/dev/null 2>&1
-    killall -9 portmap
+    /etc/init.d/portmap stop >/dev/null &>/dev/null
+    killall -9 portmap &>/dev/null
 }
 
 # DHCP SERVICE {{{
 function createDhcpConf
 {
-  execute "mv -fb \"$DHCPD_CONFIG_FILE_\" \"$DHCPD_CONFIG_FILE_.old\"" eprint &>/dev/null
-
-  execute "source $TEMPLATE_CONFIG_DIR_/dhcpd_config" die
+  if [ -e "$DHCPD_CONFIG_FILE_" ]; then
+    if grep $CONFIG_PATTERN_ $DHCPD_CONFIG_FILE_ &>/dev/null; then
+      execute "mv -fb \"$DHCPD_CONFIG_FILE_\" \"$DHCPD_CONFIG_FILE_.old\"" eprint &>/dev/null
+      execute "source $TEMPLATE_CONFIG_DIR_/dhcpd_config" die
+    else
+      warn "Not updating user edited configfile $DHCPD_CONFIG_FILE_"
+    fi
+  else
+    execute "source $TEMPLATE_CONFIG_DIR_/dhcpd_config" die
+  fi
 }
 
 function removeDhcpConf
 {
-  rm -f "$DHCPD_CONFIG_FILE_"
+  if [ -e "$DHCPD_CONFIG_FILE_" ]; then
+    if grep $CONFIG_PATTERN_ $DHCPD_CONFIG_FILE_ &>/dev/null; then
+      rm -f "$DHCPD_CONFIG_FILE_"
+    else
+      warn "Not deleting user edited configfile $DHCPD_CONFIG_FILE_"
+    fi
+  fi
 }
 
 
@@ -146,6 +160,16 @@ function runTftp
 
 
 # NFS  {{{
+function createNfsConfig
+{
+  execute "exportfs -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn
+}
+
+function removeNfsConfig
+{
+  execute "exportfs -u -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn
+}
+
 function startNfs
 {
   /etc/init.d/portmap start
@@ -153,14 +177,11 @@ function startNfs
   # FIXME /etc/init.d/nfs-kernel-server start
   $USR_SHARE_/nfs-kernel-server start
 
-  # FIXME Silly "/etc/init.d/nfs-kernel-server start"
-  # FIXME #246904 (init script does not start if no exports in /etc/exports)
-  execute "exportfs -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn
-  #execute "echo -e \"\n$MOUNT_POINT_   $NETWORK_/$NETMASK_(ro,no_root_squash,async)\" >> /etc/exports" warn
+  createNfsConfig
 }
 function stopNfs
 {
-  execute "exportfs -u -o ro,no_root_squash,async,nohide $NETWORK_/$NETMASK_:$MOUNT_POINT_" warn
+  removeNfsConfig
   if [[ `exportfs |wc -l` > 0 ]]; then
     dprint "There are other exports, not stopping NFS serivces"
   else
@@ -218,6 +239,19 @@ function actionClean
   stopNfs
 }
 
+function updateConfig
+{
+  local service_="$1"
+
+  case "$service_" in
+    "") createConfig ;;
+    tftp) createTftpConf ;;
+    dhcp) createDhcpConf ;;
+    nfs) removeNfsConfig; createNfsConfig ;;
+    *) warn "Service $service_ not available" ;;
+  esac
+}
+
 # SERVICES {{{
 function serviceStart
 {
@@ -325,10 +359,11 @@ fi
 case "$1" in
   start) serviceStart "$2" ;;
   stop) serviceStop "$2" ;;
+  config) updateConfig "$2" ;;
   "")  actionStart ;;
   *)  printUsage ;;
 esac
 
 # END OF FILE
 ################################################################################
-# vim:foldmethod=marker
+# vim:foldmethod=marker tabstop=2 expandtab shiftwidth=2

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index 0724675..9bf6a26 100755 (executable)
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -612,4 +612,4 @@ esac
 removeTmpFiles
 # END OF FILE
 ################################################################################
-# vim:foldmethod=marker
+# vim:foldmethod=marker tabstop=2 expandtab shiftwidth=2

diff --git a/shared_prog_vars b/shared_prog_vars
index 51d927b..e4edda8 100644 (file)
--- a/shared_prog_vars
+++ b/shared_prog_vars
@@ -75,3 +75,6 @@ INITRD_="$PATH_/mini-root"
 # only for this cards (kernel module names of drivers) drivers are copied into
 # the initrd
 CARDS_DETECTED_BY_DISCOVER="$PATH_/discover_netcards"
+
+# as long as this pattern is in a config file, it will be overwritten every time
+CONFIG_PATTERN_="__PLEASE_UPDATE_THIS_FILE__"

diff --git a/templates/dhcpd_config b/templates/dhcpd_config
index 34fe065..40b784a 100644 (file)
--- a/templates/dhcpd_config
+++ b/templates/dhcpd_config
@@ -28,6 +28,12 @@ date_=`execute date warn`
 cat >"$DHCPD_CONFIG_FILE_" <<EOT
 # ${DHCPD_CONFIG_FILE_##/*/} for GRML terminalserver
 # created on $date_
+# THIS IS A GENERATED CONFIG FROM GRML-TERMINALSERVER, DO NOT EDIT!!!
+# better adapt $TEMPLATE_CONFIG_DIR_/dhcpd_config to your needs and update config
+# with grml-terminalserver config dhcp
+#
+# If you really want to edit _this_ file remove the next line
+# __PLEASE_UPDATE_THIS_FILE__
 
 # global settings
 allow booting;