X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c40541ffc885a906a8623bba7eba99053757c1ae..3005042d932a79abbbc8ac6a76a2c899675b80dd:/openwrt/package/pptp/files/ifup.pptp

diff --git a/openwrt/package/pptp/files/ifup.pptp b/openwrt/package/pptp/files/ifup.pptp
index eda78e440..9b1ac07c2 100644
--- a/openwrt/package/pptp/files/ifup.pptp
+++ b/openwrt/package/pptp/files/ifup.pptp
@@ -23,6 +23,7 @@ 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
@@ -33,10 +34,10 @@ do_ifup $PPTP_PROTO $type
 
 # hack for some buggy ISPs
 NETMASK=$(nvram get ${type}_netmask)
-IFNAME=$(nvram get pptp_ifname)
+IFNAME=$(nvram get ${type}_device)
 [ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK
 
-/usr/sbin/pppd nodetach \
+/usr/sbin/pppd \
 	pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \
 	file /etc/ppp/options.pptp \
 	connect /bin/true \