move ppp plugins default search path and (hopefully) fix pppoe reconnect issue

[openwrt.git] / openwrt / package / ppp / ipkg / ppp-pppoe-plugin / etc / init.d / S50pppoe

diff --git a/openwrt/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe b/openwrt/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe
index 52e1d79..5d6ca5f 100755 (executable)
--- a/openwrt/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe
+++ b/openwrt/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe
@@ -6,7 +6,7 @@ WAN_PROTO=$(nvram get wan_proto)
 [ "$WAN_PROTO" = "pppoe" ] || exit 0
 
 for module in slhc ppp_generic pppox pppoe; do
 [ "$WAN_PROTO" = "pppoe" ] || exit 0
 
 for module in slhc ppp_generic pppox pppoe; do

-       insmod $module 2>/dev/null >/dev/null
+       /sbin/insmod $module 2>/dev/null >/dev/null

 done
 
 IFNAME=$(nvram get pppoe_ifname)
 done
 
 IFNAME=$(nvram get pppoe_ifname)


@@ -19,5 +19,9 @@ IDLETIME=${IDLETIME:+idle $IDLETIME}
 MTU=$(nvram get ppp_mtu)
 
 ifconfig $IFNAME up
 MTU=$(nvram get ppp_mtu)
 
 ifconfig $IFNAME up

-echo -e "plugin /usr/lib/pppd/rp-pppoe/rp-pppoe.so\nconnect /bin/true\nusepeerdns\ndefaultroute\nuser \"$USERNAME\"\npassword \"$PASSWORD\"\nmtu $MTU\n$IDLETIME\n$REDIAL" > /tmp/.pppoe-data
-/usr/sbin/pppd file /tmp/.pppoe-data $IFNAME
+echo -e "plugin rp-pppoe.so\nconnect /bin/true\nusepeerdns\ndefaultroute\nuser \"$USERNAME\"\npassword \"$PASSWORD\"\nmtu $MTU\n$IDLETIME\n$REDIAL" > /tmp/.pppoe-data
+(
+       while true; do
+               /usr/sbin/pppd nodetach file /tmp/.pppoe-data $IFNAME
+       done
+) &