Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

[people/teissler/ipfire-2.x.git] / src / initscripts / init.d / networking / red

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index ac6cec04033cd39ee8ef870dbabb75feaad81ee6..a574050d74010392d11f0e09ab8c10cc98a27e60 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -220,7 +220,7 @@ case "${1}" in
                        fi
                
                elif [ "$TYPE" == "PPPOE" ]; then
-                       
+
                        if ( ps ax | grep -q [p]ppd ); then 
                            boot_mesg "pppd is still running." ${FAILURE}
                            echo_failure
@@ -230,7 +230,10 @@ case "${1}" in
                        eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
                        
                        [ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0
-                       
+
+                       # We force the plugin method, anyway.
+                       METHOD="PPPOE_PLUGIN"
+
                        PPP_NIC=${DEVICE}
 
                        if [ "$TYPE" == "vdsl" ]; then
@@ -249,9 +252,6 @@ case "${1}" in
                                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"
-                                       # Don't startup services ...
-                                       DHCP_START="-C 70 "
-                                       DHCP_STOP="-k "
                                        # Test to see if there is a stale pid file
                                        if [ -f "$PIDFILE" ]; then
                                                ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
@@ -320,10 +320,6 @@ case "${1}" in
                                ip addr flush dev $PPP_NIC >/dev/null 2>&1
                                if [ "$TYPE" == "pptp" ]; then
                                        if [ "$PPTP_NICCFG" == "dhcp" ]; then
-                                               # Don't startup services ...
-                                               DHCP_START="-C 70 "
-                                               DHCP_STOP="-k "
-
                                                # Test to see if there is a stale pid file
                                                if [ -f "$PIDFILE" ]; then
                                                        ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
@@ -377,7 +373,7 @@ case "${1}" in
                        #                       
                        if [ "$TYPE" == "pppoe" ]; then
                                [ "${METHOD}" == "PPPOE_PLUGIN" ] && \
-                                       PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so"
+                                       PLUGOPTS="plugin rp-pppoe.so"
                        fi
 
                        ### Synchronous Mode