switch on new verbose system

[openwrt.git] / package / ppp / files / ifup.pppoe

diff --git a/package/ppp/files/ifup.pppoe b/package/ppp/files/ifup.pppoe
index a038b34..c7019fc 100644 (file)
--- a/package/ppp/files/ifup.pppoe
+++ b/package/ppp/files/ifup.pppoe
@@ -1,34 +1,30 @@
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }

-. /etc/functions.sh
-. /etc/network.overrides
-[ -e /etc/config/network ] && . /etc/config/network
+. /etc/config/network

 type=$1
 
 type=$1
 

-[ "$(nvram get ${type}_proto)" = "pppoe" ] || {
+eval "proto=\"\${${type}_proto}\""
+[ "$proto" = "pppoe" ] || {

        echo "$0: ${type}_proto isn't pppoe"
        exit
 }
 
        echo "$0: ${type}_proto isn't pppoe"
        exit
 }
 

+mkdir -p /var/lock
+

 for module in slhc ppp_generic pppox pppoe; do
        /sbin/insmod $module 2>&- >&-
 done
 
 for module in slhc ppp_generic pppox pppoe; do
        /sbin/insmod $module 2>&- >&-
 done
 

-IFNAME=$(nvram get pppoe_ifname)
-USERNAME=$(nvram get ppp_username)
-PASSWORD=$(nvram get ppp_passwd)
-KEEPALIVE=$(nvram get ppp_redialperiod)
-KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE}
-DEMAND=$(nvram get ppp_demand)
-case "$DEMAND" in
+eval "IFNAME=\"\${${type}_device}\""
+KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5}
+case "$ppp_demand" in

        on|1|enabled)
        on|1|enabled)

-               DEMAND=$(nvram get ppp_idletime)
-               DEMAND=${IDLETIME:+demand idle $IDLETIME}
+               DEMAND=${ppp_idletime:+demand idle $ppp_idletime}
+               [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND}

        ;;
        *) DEMAND="persist";;
 esac
        ;;
        *) DEMAND="persist";;
 esac

-MTU=$(nvram get ppp_mtu)
-MTU=${MTU:-1492}
+MTU=${ppp_mtu:-1492}

 
 ifconfig $IFNAME up
 /usr/sbin/pppd \
 
 ifconfig $IFNAME up
 /usr/sbin/pppd \


@@ -38,8 +34,8 @@ ifconfig $IFNAME up
        defaultroute \
        linkname $type \
        ipparam $type \
        defaultroute \
        linkname $type \
        ipparam $type \

-       user "$USERNAME" \
-       password "$PASSWORD" \
+       user "$ppp_username" \
+       password "$ppp_passwd" \

        mtu $MTU mru $MTU \
        $DEMAND \
        $KEEPALIVE \
        mtu $MTU mru $MTU \
        $DEMAND \
        $KEEPALIVE \