summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-02 15:41:31 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-02 15:41:31 +0000
commit23751dd7ecca49e5028cab4273619e3a4db74aa9 (patch)
tree59566df0d64f203d66af8b37aea0c35f186d4d7c
parent6e0c8a6f0ab9508f5e0851a52808a1e0d833ccd5 (diff)
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
-rw-r--r--package/ppp/Makefile2
-rwxr-xr-xpackage/ppp/ipkg/ppp-pppoe-plugin/etc/init.d/S50pppoe22
2 files changed, 12 insertions, 12 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 046d47beb..e42a37a76 100644
--- 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_RELEASE := 3
+PKG_RELEASE := 4
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 5d6ca5f3a..7e635ee79 100755
--- 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
-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
) &