X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c40541ffc885a906a8623bba7eba99053757c1ae..3005042d932a79abbbc8ac6a76a2c899675b80dd:/openwrt/package/ppp/files/ifup.pppoe?ds=inline

diff --git a/openwrt/package/ppp/files/ifup.pppoe b/openwrt/package/ppp/files/ifup.pppoe
index 4c42fa5bb..1f9cd739c 100644
--- a/openwrt/package/ppp/files/ifup.pppoe
+++ b/openwrt/package/ppp/files/ifup.pppoe
@@ -14,16 +14,17 @@ for module in slhc ppp_generic pppox pppoe; do
 	/sbin/insmod $module 2>&- >&-
 done
 
-IFNAME=$(nvram get pppoe_ifname)
+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}
+KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 1 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}
+		[ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND}
 	;;
 	*) DEMAND="persist";;
 esac
@@ -31,7 +32,7 @@ MTU=$(nvram get ppp_mtu)
 MTU=${MTU:-1492}
 
 ifconfig $IFNAME up
-/usr/sbin/pppd nodetach \
+/usr/sbin/pppd \
 	plugin rp-pppoe.so \
 	connect /bin/true \
 	usepeerdns \