From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 2 Apr 2005 15:41:31 +0000 (+0000)
Subject: make pppoe init script re-read nvram settings before restarting pppd
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=61e9ba342f23e340cad156f830601fe4013c32a3;p=openwrt%2Fstaging%2Fmkresin.git

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

SVN-Revision: 519
---

diff --git a/openwrt/package/ppp/Makefile b/openwrt/package/ppp/Makefile
index 046d47beb0..e42a37a76e 100644
--- a/openwrt/package/ppp/Makefile
+++ b/openwrt/package/ppp/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 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/
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 5d6ca5f3a9..7e635ee790 100755
--- a/openwrt/package/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe
+++ b/openwrt/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
 
-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
+		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
 ) &