Fix dhcpclient for IPTV and PPTP.
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 6 Oct 2009 21:18:42 +0000 (23:18 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 6 Oct 2009 21:18:42 +0000 (23:18 +0200)
src/initscripts/init.d/networking/red

index f0bec1d1a07f0b80b6d1b0ed0a1238e02a764544..e1d919ac72a63981c0c8020b30610983f7a0f86a 100644 (file)
@@ -257,11 +257,11 @@ case "${1}" in
                                sleep 0.2
                                ip link set ${PPP_NIC} up
                                TYPE="pppoe"
-
                                if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then
                                        PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
                                        LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
-
+                                       DHCP_START="-N -R -L /var/ipfire/dhcpc "
+                                       DHCP_STOP="-k "
                                        # Test to see if there is a stale pid file
                                        if [ -f "$PIDFILE" ]; then
                                                ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
@@ -330,6 +330,8 @@ case "${1}" in
                                ip addr flush dev $PPP_NIC >/dev/null 2>&1
                                if [ "$TYPE" == "pptp" ]; then
                                        if [ "$PPTP_NICCFG" == "dhcp" ]; then
+                                               DHCP_START="-N -R -L /var/ipfire/dhcpc "
+                                               DHCP_STOP="-k "
 
                                                # Test to see if there is a stale pid file
                                                if [ -f "$PIDFILE" ]; then