hotplug-based network script rewrite

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

2 files changed, 56 insertions, 65 deletions

diff --git a/package/ppp/files/ifup.pppoa b/package/ppp/files/ifup.pppoa
index 5f42a39d0..6539c3ae8 100644
--- a/package/ppp/files/ifup.pppoa
+++ b/package/ppp/files/ifup.pppoa
@@ -14,36 +14,31 @@ for module in slhc ppp_generic pppoatm; do
 	/sbin/insmod $module 2>&- >&-
 done
 
-while :; do
-	VPI=$(nvram get atm_vpi)
-	VCI=$(nvram get atm_vci)
-	USERNAME=$(nvram get ppp_username)
-	PASSWORD=$(nvram get ppp_passwd)
-	KEEPALIVE=$(nvram get ppp_redialperiod)
-	KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE}
-	DEMAND=$(nvram get ppp_demand)
-	case "$DEMAND" in
-		on|1|enabled)
-			DEMAND=$(nvram get ppp_idletime)
-			DEMAND=${IDLETIME:+demand idle $IDLETIME}
-		;;
-		*) DEMAND="";;
-	esac
-	MTU=$(nvram get ppp_mtu)
-	MTU=${MTU:-1500}
+VPI=$(nvram get atm_vpi)
+VCI=$(nvram get atm_vci)
+USERNAME=$(nvram get ppp_username)
+PASSWORD=$(nvram get ppp_passwd)
+KEEPALIVE=$(nvram get ppp_redialperiod)
+KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE}
+DEMAND=$(nvram get ppp_demand)
+case "$DEMAND" in
+	on|1|enabled)
+		DEMAND=$(nvram get ppp_idletime)
+		DEMAND=${IDLETIME:+demand idle $IDLETIME}
+	;;
+	*) DEMAND="persist";;
+esac
+MTU=$(nvram get ppp_mtu)
+MTU=${MTU:-1500}
 
-	/usr/sbin/pppd nodetach \
+/usr/sbin/pppd nodetach \
 	plugin pppoatm.so ${VPI:-8}.${VCI:-35} \
-		usepeerdns \
-		defaultroute \
-		linkname $type \
-		ipparam $type \
-		user "$USERNAME" \
-		password "$PASSWORD" \
-		mtu $MTU mru $MTU \
-		$DEMAND \
-		$KEEPALIVE
-	
-	# Read settings again (might have changed)
-	[ -e /etc/config/network ] && . /etc/config/network
-done &
+	usepeerdns \
+	defaultroute \
+	linkname $type \
+	ipparam $type \
+	user "$USERNAME" \
+	password "$PASSWORD" \
+	mtu $MTU mru $MTU \
+	$DEMAND \
+	$KEEPALIVE
diff --git a/package/ppp/files/ifup.pppoe b/package/ppp/files/ifup.pppoe
index 36bbe3029..4c42fa5bb 100644
--- a/package/ppp/files/ifup.pppoe
+++ b/package/ppp/files/ifup.pppoe
@@ -14,38 +14,34 @@ for module in slhc ppp_generic pppox pppoe; do
 	/sbin/insmod $module 2>&- >&-
 done
 
-while :; do
-	IFNAME=$(nvram get pppoe_ifname)
-	USERNAME=$(nvram get ppp_username)
-	PASSWORD=$(nvram get ppp_passwd)
-	KEEPALIVE=$(nvram get ppp_redialperiod)
-	KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE}
-	DEMAND=$(nvram get ppp_demand)
-	case "$DEMAND" in
-		on|1|enabled)
-			DEMAND=$(nvram get ppp_idletime)
-			DEMAND=${IDLETIME:+demand idle $IDLETIME}
-		;;
-		*) DEMAND="";;
-	esac
-	MTU=$(nvram get ppp_mtu)
-	MTU=${MTU:-1492}
+IFNAME=$(nvram get pppoe_ifname)
+USERNAME=$(nvram get ppp_username)
+PASSWORD=$(nvram get ppp_passwd)
+KEEPALIVE=$(nvram get ppp_redialperiod)
+KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE}
+DEMAND=$(nvram get ppp_demand)
+case "$DEMAND" in
+	on|1|enabled)
+		DEMAND=$(nvram get ppp_idletime)
+		DEMAND=${IDLETIME:+demand idle $IDLETIME}
+	;;
+	*) DEMAND="persist";;
+esac
+MTU=$(nvram get ppp_mtu)
+MTU=${MTU:-1492}
+
+ifconfig $IFNAME up
+/usr/sbin/pppd nodetach \
+	plugin rp-pppoe.so \
+	connect /bin/true \
+	usepeerdns \
+	defaultroute \
+	linkname $type \
+	ipparam $type \
+	user "$USERNAME" \
+	password "$PASSWORD" \
+	mtu $MTU mru $MTU \
+	$DEMAND \
+	$KEEPALIVE \
+	nic-$IFNAME
 
-	ifconfig $IFNAME up
-	/usr/sbin/pppd nodetach \
-		plugin rp-pppoe.so \
-		connect /bin/true \
-		usepeerdns \
-		defaultroute \
-		linkname $type \
-		ipparam $type \
-		user "$USERNAME" \
-		password "$PASSWORD" \
-		mtu $MTU mru $MTU \
-		$DEMAND \
-		$KEEPALIVE \
-		nic-$IFNAME
-	
-	# Read settings again (might have changed)
-	[ -e /etc/config/network ] && . /etc/config/network
-done &