removed udhcpc

[grml-terminalserver.git] / grml-terminalserver

diff --git a/grml-terminalserver b/grml-terminalserver
index 458b203..0cb1883 100755 (executable)
--- a/grml-terminalserver
+++ b/grml-terminalserver
@@ -194,7 +194,7 @@ function createTftpConf
 {
   removeTftpConf
 
-  execute "mkdir $TFTPD_DATA_DIR_/pxelinux.cfg" die
+  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
@@ -207,12 +207,12 @@ function createTftpConf
 
 function stopTftp
 {
-  start-stop-daemon --stop --quiet --name "${TFTPD_BIN_##*/}"
+  start-stop-daemon --stop --quiet -p "$TFTPD_PID_"
 }
 function startTftp
 {
   test -f $TFTPD_BIN_ || die "could not find \"$TFTPD_BIN_\""
-  start-stop-daemon --start --quiet --exec "$TFTPD_BIN_" -- -l -a "$IP_" -s "$TFTPD_DATA_DIR_" || \
+  start-stop-daemon --start --quiet --exec "$TFTPD_BIN_" -- --daemon --no-multicast --pidfile "$TFTPD_PID_" --bind-address "$IP_" "$TFTPD_DATA_DIR_" || \
     warn "problems starting tftpd server"
 }
 function runTftp
@@ -278,7 +278,7 @@ function actionStart
   echo -n "Starting dhcpd: "
   runDhcp && echo done || echo failed
 
-  runIptables
+  #runIptables
 
   echo "Finally starting nfs services..."
   startNfs && echo "Sucessfully finished startup of grml-terminalserver." || echo 'Startup of grml-terminalserver-config failed!'