From: Michael Tremer Date: Wed, 30 Jun 2010 09:36:06 +0000 (+0200) Subject: Enforce the pppoe plugin method in the networking scripts. X-Git-Tag: v2.9-beta1~171^2~8^2~5^2~1 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=06b912c5c5706a4dffa16543c66a2d7f06a4da8d;hp=-c Enforce the pppoe plugin method in the networking scripts. --- 06b912c5c5706a4dffa16543c66a2d7f06a4da8d diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index f60c0d1591..0a642f8e8f 100644 --- 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