From: Michael Prokop <mika@grml.org>
Date: Wed, 29 Sep 2010 13:25:39 +0000 (+0200)
Subject: Adapt dhcp configuration to dhcp3-server -> isc-dhcp-server transition.
X-Git-Tag: v0.99.11~6^2~1
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=acc441def5620251d33900a37a911d3c3716fe5a

Adapt dhcp configuration to dhcp3-server -> isc-dhcp-server transition.
---

diff --git a/grml-terminalserver b/grml-terminalserver
index 3511cd3..4d6ea50 100755
--- a/grml-terminalserver
+++ b/grml-terminalserver
@@ -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
+  rm -f /var/lib/dhcp*/dhcpd.leases* 2>/dev/null    #FIXME
+  touch /var/lib/dhcp*/dhcpd.leases
 }
 
 function startDhcp
diff --git a/shared_prog_vars b/shared_prog_vars
index 1573b51..d0c9f3b 100644
--- a/shared_prog_vars
+++ b/shared_prog_vars
@@ -41,7 +41,12 @@ DIALOG_="dialog"
 CONFIG_PROG_="/usr/sbin/grml-terminalserver-config"
 
 # vars for dhcpd
-DHCPD_BIN_="/usr/sbin/dhcpd3"
+if [ -x /usr/sbin/dhcpd3 ] ; then
+  DHCPD_BIN_="/usr/sbin/dhcpd3"
+else
+  DHCPD_BIN_="/usr/sbin/dhcpd"
+fi
+
 DHCPD_CONFIG_FILE_="$PATH_/dhcpd.conf"
 DHCPD_PID_="/var/run/dhcpd.pid"