remove duplicate code

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

diff --git a/openwrt/package/ppp/files/ifup.pppoe b/openwrt/package/ppp/files/ifup.pppoe
index 2bec9c6..a038b34 100644 (file)
--- a/openwrt/package/ppp/files/ifup.pppoe
+++ b/openwrt/package/ppp/files/ifup.pppoe
@@ -1,7 +1,7 @@
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
-. /etc/nvram.overrides
+. /etc/network.overrides
 [ -e /etc/config/network ] && . /etc/config/network
 type=$1
 
@@ -14,29 +14,34 @@ for module in slhc ppp_generic pppox pppoe; do
        /sbin/insmod $module 2>&- >&-
 done
 
-while :; do
-       IFNAME=nic-$(nvram get pppoe_ifname)
-       USERNAME=$(nvram get ppp_username)
-       PASSWORD=$(nvram get ppp_passwd)
-       REDIAL=$(nvram get ppp_redialperiod)
-       REDIAL=${REDIAL:+lcp-echo-interval $REDIAL}
-       IDLETIME=$(nvram get ppp_idletime)
-       IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME}
-       MTU=$(nvram get ppp_mtu)
-       MTU=${MTU:-1492}
-       MTU=${MTU:+ mtu $MTU mru $MTU}
+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
+       on|1|enabled)
+               DEMAND=$(nvram get ppp_idletime)
+               DEMAND=${IDLETIME:+demand idle $IDLETIME}
+       ;;
+       *) DEMAND="persist";;
+esac
+MTU=$(nvram get ppp_mtu)
+MTU=${MTU:-1492}
+
+ifconfig $IFNAME up
+/usr/sbin/pppd \
+       plugin rp-pppoe.so \
+       connect /bin/true \
+       usepeerdns \
+       defaultroute \
+       linkname $type \
+       ipparam $type \
+       user "$USERNAME" \
+       password "$PASSWORD" \
+       mtu $MTU mru $MTU \
+       $DEMAND \
+       $KEEPALIVE \
+       nic-$IFNAME
 
-       ifconfig $IFNAME up
-       /usr/sbin/pppd nodetach \
-               plugin rp-pppoe.so \
-               connect /bin/true \
-               usepeerdns \
-               defaultroute \
-               linkname $type \
-               user "$USERNAME" \
-               password "$PASSWORD" \
-               $MTU \
-               $IDLETIME \
-               $REDIAL \
-               $IFNAME
-done &