Merge commit 'ms/ppp-update'

This commit is contained in:
Arne Fitzenreiter
2010-07-05 22:53:59 +02:00
7 changed files with 27 additions and 139 deletions

View File

@@ -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