X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-terminalserver;h=3c6b07f5a97133931a031387fa892e737554cdc8;hb=b3b2bf90c5105b987e02d264e87899f6502761d3;hp=fde1b2913c9fc0dffe92f3dcc43bd85446f27c03;hpb=3da5aa3e46e387154620f23fb2eaf83d8db82560;p=grml-terminalserver.git

diff --git a/grml-terminalserver b/grml-terminalserver
index fde1b29..3c6b07f 100755
--- a/grml-terminalserver
+++ b/grml-terminalserver
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      terminalserver
 # Purpose:       Program to do something
 # Authors:       grml-team (grml.org), (c) Michael Gebetsroither <gebi@grml.org>
@@ -110,8 +110,8 @@ function stopDhcp
 {
   start-stop-daemon --stop --quiet --pidfile "$DHCPD_PID_"
   rm -f $DHCPD_PID_
-  rm -f /var/lib/dhcp3/dhcpd.leases* 2>/dev/null    #FIXME
-  touch /var/lib/dhcp3/dhcpd.leases
+  find  /var/lib/dhcp* -type f -name dhcpd.leases -delete
+  touch /var/lib/dhcp*/dhcpd.leases
 }
 
 function startDhcp
@@ -202,7 +202,11 @@ function createTftpConf
   execute "mkdir -p $TFTPD_DATA_DIR_/pxelinux.cfg" die
   execute "install -m 644 /usr/lib/syslinux/pxelinux.0 $TFTPD_DATA_DIR_" die
   execute "install -m 644 $PATH_/minirt26.gz $TFTPD_DATA_DIR_" die
-  execute "install -m 644 $KERNEL_IMAGE_ $TFTPD_DATA_DIR_/linux26" die
+  if [ -d "$MOUNT_POINT_"/boot/release ] ; then
+    cp -r "$MOUNT_POINT_"/boot/release "$TFTPD_DATA_DIR_"
+  else
+    execute "install -m 644 $KERNEL_IMAGE_ $TFTPD_DATA_DIR_/linux26" die
+  fi
   execute "install -m 644 $MEMTEST_IMAGE_ $TFTPD_DATA_DIR_/memtest" die
   execute "install -m 644 $PXE_BOOT_MSG_ $TFTPD_DATA_DIR_" die
   execute "install -m 644 $PXE_BOOT_LOGO_ $TFTPD_DATA_DIR_" die
@@ -246,6 +250,7 @@ function startNfs
   /etc/init.d/nfs-common start
   # FIXME /etc/init.d/nfs-kernel-server start
   $USR_SHARE_/nfs-kernel-server start
+  echo
 
   createNfsConfig
 }
@@ -286,7 +291,7 @@ function actionStart
   runIptables
 
   echo "Finally starting nfs services..."
-  startNfs && echo "Sucessfully finished startup of grml-terminalserver." || echo 'Startup of grml-terminalserver failed!'
+  startNfs && echo "Successfully finished startup of grml-terminalserver." || echo 'Startup of grml-terminalserver failed!'
 }
 
 function actionStop