From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 14 Oct 2009 22:16:32 +0000 (+0200)
Subject: Fix dhcp leasefile for pptp over dhcp.
X-Git-Tag: v2.9-beta1~695
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=367a7770117c27507bea4fe085bdce52739f82bf

Fix dhcp leasefile for pptp over dhcp.
---

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index e1d919ac72..b1b4341c41 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -337,13 +337,13 @@ case "${1}" in
 						if [ -f "$PIDFILE" ]; then
 							ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
 							if [ $? != 0 ]; then
-								rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
+								rm -f /var/run/dhcpcd-${DEVICE}.pid > /dev/null
 							fi
 						fi
 
 						if [ ! -f "$PIDFILE" ]; then
 							boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
-							/sbin/dhcpcd ${DEVICE} -G ${DHCP_START} >/dev/null 2>&1
+							/sbin/dhcpcd ${DEVICE} ${DHCP_START} >/dev/null 2>&1
 							RET="$?"
 
 							if [ "$RET" = "0" ]; then