From b80a2426c5c61a7bb442fcff1873912a1bea8408 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 23 Aug 2005 12:53:17 +0000 Subject: [PATCH] fix pppoe init script SVN-Revision: 1734 --- openwrt/package/ppp/files/ifup.pppoe | 51 +++++++++++++++------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/openwrt/package/ppp/files/ifup.pppoe b/openwrt/package/ppp/files/ifup.pppoe index 2bec9c6fe0..1111131222 100644 --- a/openwrt/package/ppp/files/ifup.pppoe +++ b/openwrt/package/ppp/files/ifup.pppoe @@ -1,7 +1,7 @@ #!/bin/sh [ $# = 0 ] && { echo " $0 "; 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 & -- 2.25.1