make pppoe init script re-read nvram settings before restarting pppd

[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..7e635ee 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,18 +6,22 @@ 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
 
 done
 

-IFNAME=$(nvram get pppoe_ifname)
-USERNAME=$(nvram get ppp_username)
-PASSWORD=$(nvram get ppp_passwd)
-REDIAL=$(nvram get ppp_redialperiod)
-REDIAL=${REDIAL:+holdoff $REDIAL}
-IDLETIME=$(nvram get ppp_idletime)
-IDLETIME=${IDLETIME:+idle $IDLETIME}
-MTU=$(nvram get ppp_mtu)
+(
+       while true; do
+               IFNAME=$(nvram get pppoe_ifname)
+               USERNAME=$(nvram get ppp_username)
+               PASSWORD=$(nvram get ppp_passwd)
+               REDIAL=$(nvram get ppp_redialperiod)
+               REDIAL=${REDIAL:+holdoff $REDIAL}
+               IDLETIME=$(nvram get ppp_idletime)
+               IDLETIME=${IDLETIME:+idle $IDLETIME}
+               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
+               ifconfig $IFNAME up
+               echo -e "plugin rp-pppoe.so\nconnect /bin/true\nusepeerdns\ndefaultroute\nuser \"$USERNAME\"\npassword \"$PASSWORD\"\nmtu $MTU\n$IDLETIME\n$REDIAL" > /tmp/.pppoe-data
+               /usr/sbin/pppd nodetach file /tmp/.pppoe-data $IFNAME
+       done
+) &