Skip to content
Browse files

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

  • Loading branch information...
1 parent ebabb68 commit acc441def5620251d33900a37a911d3c3716fe5a @mika mika committed
Showing with 8 additions and 3 deletions.
  1. +2 −2 grml-terminalserver
  2. +6 −1 shared_prog_vars
View
4 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
View
7 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"

0 comments on commit acc441d

Please sign in to comment.
Something went wrong with that request. Please try again.