X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fppp%2Ffiles%2Fifup.pppoe;h=b43d2689bd05b240338c8ee074d339b730edbaba;hb=23e86550c9c59436cc5f253292774861dd6ca62e;hp=94179a3eaa473d2e4034d1561301349779b9c8e5;hpb=f80d4fdc68858ba956a39e19ad6efa868beb827e;p=openwrt-10.03%2F.git

diff --git a/package/ppp/files/ifup.pppoe b/package/ppp/files/ifup.pppoe
index 94179a3ea..b43d2689b 100644
--- a/package/ppp/files/ifup.pppoe
+++ b/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,28 +14,34 @@ for module in slhc ppp_generic pppox pppoe; do
 	/sbin/insmod $module 2>&- >&-
 done
 
-while :; do
-	IFNAME=$(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:+ mtu $MTU mru $MTU}
+IFNAME=$(nvram get ${type}_device)
+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 &