update lighttpd to 1.4.11

[openwrt.git] / package / pptp / files / ifup.pptp

diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp
index eda78e4..9b1ac07 100644 (file)
--- a/package/pptp/files/ifup.pptp
+++ b/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}
        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
        ;;
        *) DEMAND="persist";;
 esac


@@ -33,10 +34,10 @@ do_ifup $PPTP_PROTO $type
 
 # hack for some buggy ISPs
 NETMASK=$(nvram get ${type}_netmask)
 
 # 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
 
 [ -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 \
        pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \
        file /etc/ppp/options.pptp \
        connect /bin/true \