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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@519 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 046d47b..e42a37a 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME := ppp
 PKG_VERSION := 2.4.3
 
 PKG_NAME := ppp
 PKG_VERSION := 2.4.3

-PKG_RELEASE := 3
+PKG_RELEASE := 4

 PKG_MD5SUM := 848f6c3cafeb6074ffeb293c3af79b7c
 
 PKG_SOURCE_SITE := ftp://ftp.samba.org/pub/ppp/
 PKG_MD5SUM := 848f6c3cafeb6074ffeb293c3af79b7c
 
 PKG_SOURCE_SITE := ftp://ftp.samba.org/pub/ppp/

diff --git a/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe b/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe
index 5d6ca5f..7e635ee 100755 (executable)
--- a/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe
+++ b/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe
@@ -9,19 +9,19 @@ for module in slhc ppp_generic pppox pppoe; do
        /sbin/insmod $module 2>/dev/null >/dev/null
 done
 
        /sbin/insmod $module 2>/dev/null >/dev/null
 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)
-
-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

 (
        while true; do
 (
        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 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
 ) &
                /usr/sbin/pppd nodetach file /tmp/.pppoe-data $IFNAME
        done
 ) &