diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-08-23 12:53:17 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-08-23 12:53:17 +0000 |
| commit | 7ef1c93d15ef2f3c6ce44d7ae257cf263d71188c (patch) | |
| tree | d073263a19a87cc8625a640c6c501a0757c82c4e | |
| parent | 2ca1408a2cd8da17f036dc0f8f27c8a4d4ca52df (diff) | |
| download | master-187ad058-7ef1c93d15ef2f3c6ce44d7ae257cf263d71188c.tar.gz master-187ad058-7ef1c93d15ef2f3c6ce44d7ae257cf263d71188c.tar.bz2 master-187ad058-7ef1c93d15ef2f3c6ce44d7ae257cf263d71188c.zip | |
fix pppoe init script
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1734 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/ppp/files/ifup.pppoe | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/package/ppp/files/ifup.pppoe b/package/ppp/files/ifup.pppoe index 2bec9c6fe0..1111131222 100644 --- a/package/ppp/files/ifup.pppoe +++ b/package/ppp/files/ifup.pppoe @@ -1,7 +1,7 @@ #!/bin/sh [ $# = 0 ] && { echo " $0 <group>"; exit; } . /etc/functions.sh -. /etc/nvram.overrides +. /etc/network.overrides [ -e /etc/config/network ] && . /etc/config/network type=$1 @@ -15,28 +15,31 @@ for module in slhc ppp_generic pppox pppoe; do done while :; do - IFNAME=nic-$(nvram get pppoe_ifname) - USERNAME=$(nvram get ppp_username) - PASSWORD=$(nvram get ppp_passwd) - REDIAL=$(nvram get ppp_redialperiod) - REDIAL=${REDIAL:+lcp-echo-interval $REDIAL} - IDLETIME=$(nvram get ppp_idletime) - IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME} - MTU=$(nvram get ppp_mtu) - MTU=${MTU:-1492} - MTU=${MTU:+ mtu $MTU mru $MTU} + IFNAME=$(nvram get pppoe_ifname) + USERNAME=$(nvram get ppp_username) + PASSWORD=$(nvram get ppp_passwd) + REDIAL=$(nvram get ppp_redialperiod) + REDIAL=${REDIAL:+lcp-echo-interval $REDIAL} + IDLETIME=$(nvram get ppp_idletime) + IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME} + MTU=$(nvram get ppp_mtu) + MTU=${MTU:-1492} + MTU=${MTU:+ mtu $MTU mru $MTU} - ifconfig $IFNAME up - /usr/sbin/pppd nodetach \ - plugin rp-pppoe.so \ - connect /bin/true \ - usepeerdns \ - defaultroute \ - linkname $type \ - user "$USERNAME" \ - password "$PASSWORD" \ - $MTU \ - $IDLETIME \ - $REDIAL \ - $IFNAME + ifconfig $IFNAME up + /usr/sbin/pppd nodetach \ + plugin rp-pppoe.so \ + connect /bin/true \ + usepeerdns \ + defaultroute \ + linkname $type \ + user "$USERNAME" \ + password "$PASSWORD" \ + $MTU \ + $IDLETIME \ + $REDIAL \ + nic-$IFNAME + + # Read settings again (might have changed) + [ -e /etc/config/network ] && . /etc/config/network done & |