remove atftp dependency on /etc/services, add dependency on libncurses (#384)

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

diff --git a/openwrt/package/pptp/files/ifup.pptp b/openwrt/package/pptp/files/ifup.pptp
index c8a1a5e..9b1ac07 100644 (file)
--- 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}
        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,7 +34,7 @@ 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
 
 /usr/sbin/pppd \
 [ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK
 
 /usr/sbin/pppd \