fix the xt/ipt module path issue

[openwrt.git] / openwrt / package / ppp / files / ifup.pppoa

diff --git a/openwrt/package/ppp/files/ifup.pppoa b/openwrt/package/ppp/files/ifup.pppoa
index 5f42a39..baea25e 100644 (file)
--- a/openwrt/package/ppp/files/ifup.pppoa
+++ b/openwrt/package/ppp/files/ifup.pppoa
@@ -14,36 +14,32 @@ for module in slhc ppp_generic pppoatm; do
        /sbin/insmod $module 2>&- >&-
 done
 
-while :; do
-       VPI=$(nvram get atm_vpi)
-       VCI=$(nvram get atm_vci)
-       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="";;
-       esac
-       MTU=$(nvram get ppp_mtu)
-       MTU=${MTU:-1500}
+VPI=$(nvram get atm_vpi)
+VCI=$(nvram get atm_vci)
+USERNAME=$(nvram get ppp_username)
+PASSWORD=$(nvram get ppp_passwd)
+KEEPALIVE=$(nvram get ppp_redialperiod)
+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
+MTU=$(nvram get ppp_mtu)
+MTU=${MTU:-1500}
 
-       /usr/sbin/pppd nodetach \
+/usr/sbin/pppd \
        plugin pppoatm.so ${VPI:-8}.${VCI:-35} \
-               usepeerdns \
-               defaultroute \
-               linkname $type \
-               ipparam $type \
-               user "$USERNAME" \
-               password "$PASSWORD" \
-               mtu $MTU mru $MTU \
-               $DEMAND \
-               $KEEPALIVE
-       
-       # Read settings again (might have changed)
-       [ -e /etc/config/network ] && . /etc/config/network
-done &
+       usepeerdns \
+       defaultroute \
+       linkname $type \
+       ipparam $type \
+       user "$USERNAME" \
+       password "$PASSWORD" \
+       mtu $MTU mru $MTU \
+       $DEMAND \
+       $KEEPALIVE