X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver;h=663926a38371300a2c0bc12b3273a6a53b242efe;hb=4606103ad6fcc40749d08ff43bb8cc0359115e34;hp=7b990d271371e8df39e64b98bc0da78b588a242c;hpb=0696e9c985b9324d559845aa67642c7dcb020d54;p=grml-terminalserver.git

diff --git a/grml-terminalserver b/grml-terminalserver
index 7b990d2..663926a 100755
--- a/grml-terminalserver
+++ b/grml-terminalserver
@@ -20,6 +20,7 @@
 ### __VARIABLES
 ###
 
+FORCE_='false'
 verbose_=0
 
 # this file holds all variable definitions
@@ -42,8 +43,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
 
@@ -56,22 +58,50 @@ SERVICES:
 OPTIONS:
    -v         verbose (show what is going on, v++)
    -h         this help text
+   -f         Force
 
 EOT
 }
 
+function killPortmapper
+{
+    /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
+      if [[ $FORCE_ == "true" ]]; 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_, user -f to override"
+      fi
+    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
+      if [[ $FORCE_ == "true" ]]; then
+        rm -f "$DHCPD_CONFIG_FILE_"
+      else
+        warn "Not deleting user edited configfile $DHCPD_CONFIG_FILE_, user -f to override"
+      fi
+    fi
+  fi
 }
 
 
@@ -141,6 +171,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
@@ -148,20 +188,17 @@ 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
     /etc/init.d/nfs-kernel-server stop >/dev/null 2>&1
     /etc/init.d/nfs-common stop >/dev/null 2>&1
-    /etc/init.d/portmap stop >/dev/null 2>&1
+    killPortmapper
   fi
 }
 # }}}
@@ -213,6 +250,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
 {
@@ -245,8 +295,9 @@ function serviceStop
 ### __MAIN
 ###
 
-while getopts "i:hv" opt; do
+while getopts "fi:hv" opt; do
   case "$opt" in
+    f) FORCE_='true' ;;
     h) printUsage; exit ;;
     v) let verbose_=$verbose_+1 ;;
     ?) printUsage; exit 64 ;;
@@ -320,10 +371,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