change from in.tftpd to atftpd

diff --git a/Makefile b/Makefile
index dfafe8e..345c6df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,12 +32,10 @@ install: bin
        $(install_) -m 755 nfs-kernel-server $(usrshare)
        $(install_) -m 755 linuxrc $(usrshare)
        $(install_) -m 755 udhcp-config.sh $(usrshare)
-       $(install_) -m 755 modcalc $(usrshare)
        $(install_) -m 755 rdir $(usrshare)
        $(install_) -m 755 cdir $(usrshare)
        $(install_) -m 755 timeout $(usrshare)
        $(install_) -m 755 udhcp/udhcpc $(usrshare)
-       $(install_) -m 755 discover-nic $(usrshare)
        cp -r templates $(usrshare)
 
        $(install_) -m 755 -d $(usrsbin)

diff --git a/debian/control b/debian/control
index 5fc729d..5c1ea80 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
 
 Package: grml-terminalserver
 Architecture: any
-Depends: grml-shlib (>=1.02.03), grml-terminalserver-data (>=0.62), dialog, dhcp3-server, tftpd-hpa, syslinux, gcc-3.3, ipcalc, ash
+Depends: grml-shlib (>=1.02.03), grml-terminalserver-data (>=0.62), dialog, dhcp3-server, atftpd (>=0.7.dfsg-1.2), syslinux, gcc-3.3, ipcalc, ash
 Description: terminalserver for grml
  This software should netboot grml on other computers over the
  network. The terminalserver also works with NON-PXE

diff --git a/grml-terminalserver b/grml-terminalserver
index 458b203..3303df4 100755 (executable)
--- a/grml-terminalserver
+++ b/grml-terminalserver
@@ -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!'

diff --git a/shared_prog_vars b/shared_prog_vars
index b7d5a96..1fc8270 100644 (file)
--- a/shared_prog_vars
+++ b/shared_prog_vars
@@ -40,10 +40,10 @@ CONFIG_PROG_="/usr/sbin/grml-terminalserver-config"
 # vars for dhcpd
 DHCPD_BIN_="/usr/sbin/dhcpd3"
 DHCPD_CONFIG_FILE_="$PATH_/dhcpd.conf"
-DHCPD_PID_=/var/run/dhcpd.pid
+DHCPD_PID_="/var/run/dhcpd.pid"
 
 # vars for tftpd
-TFTPD_BIN_="/usr/sbin/in.tftpd"
+TFTPD_BIN_="/usr/sbin/atftpd"
 TFTPD_DATA_DIR_="/var/lib/tftpboot"
 TFTPD_PID_="/var/run/grml-tftpd.pid"