]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Fix dhcp leasefile for pptp over dhcp.
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 14 Oct 2009 22:16:32 +0000 (00:16 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 14 Oct 2009 22:16:32 +0000 (00:16 +0200)
src/initscripts/init.d/networking/red

index e1d919ac72a63981c0c8020b30610983f7a0f86a..b1b4341c416b37f3e4896eb9d5e90b49d05b77e3 100644 (file)
@@ -337,13 +337,13 @@ case "${1}" in
                                                if [ -f "$PIDFILE" ]; then
                                                        ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
                                                        if [ $? != 0 ]; then
                                                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..."
                                                        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
                                                        RET="$?"
 
                                                        if [ "$RET" = "0" ]; then