large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

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

2 files changed, 20 insertions, 36 deletions

diff --git a/package/ppp/files/ifup.pppoa b/package/ppp/files/ifup.pppoa
index baea25ebf2..277266c0f5 100644
--- a/package/ppp/files/ifup.pppoa
+++ b/package/ppp/files/ifup.pppoa
@@ -1,11 +1,10 @@
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
-. /etc/functions.sh
-. /etc/network.overrides
-[ -e /etc/config/network ] && . /etc/config/network
+. /etc/config/network
 type=$1
 
-[ "$(nvram get ${type}_proto)" = "pppoa" ] || {
+eval "proto=\"\${${type}_proto}\""
+[ "$proto" = "pppoa" ] || {
 	echo "$0: ${type}_proto isn't pppoa"
 	exit
 }
@@ -14,32 +13,24 @@ for module in slhc ppp_generic pppoatm; do
 	/sbin/insmod $module 2>&- >&-
 done
 
-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 1 lcp-echo-failure $KEEPALIVE}
-DEMAND=$(nvram get ppp_demand)
-case "$DEMAND" in
+KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5}
+case "$ppp_demand" in
 	on|1|enabled)
-		DEMAND=$(nvram get ppp_idletime)
-		DEMAND=${IDLETIME:+demand idle $IDLETIME}
+		DEMAND=${ppp_idletime:+demand idle $ppp_idletime}
 		[ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND}
 	;;
 	*) DEMAND="persist";;
 esac
-MTU=$(nvram get ppp_mtu)
-MTU=${MTU:-1500}
+MTU=${ppp_mtu:-1500}
 
 /usr/sbin/pppd \
-	plugin pppoatm.so ${VPI:-8}.${VCI:-35} \
+	plugin pppoatm.so ${atm_vpi:-8}.${atm_vci:-35} \
 	usepeerdns \
 	defaultroute \
 	linkname $type \
 	ipparam $type \
-	user "$USERNAME" \
-	password "$PASSWORD" \
+	user "$ppp_username" \
+	password "$ppp_passwd" \
 	mtu $MTU mru $MTU \
 	$DEMAND \
 	$KEEPALIVE
diff --git a/package/ppp/files/ifup.pppoe b/package/ppp/files/ifup.pppoe
index 1f9cd739c3..0f3c14ed0d 100644
--- a/package/ppp/files/ifup.pppoe
+++ b/package/ppp/files/ifup.pppoe
@@ -1,11 +1,10 @@
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
-. /etc/functions.sh
-. /etc/network.overrides
-[ -e /etc/config/network ] && . /etc/config/network
+. /etc/config/network
 type=$1
 
-[ "$(nvram get ${type}_proto)" = "pppoe" ] || {
+eval "proto=\"\${${type}_proto}\""
+[ "$proto" = "pppoe" ] || {
 	echo "$0: ${type}_proto isn't pppoe"
 	exit
 }
@@ -14,22 +13,16 @@ for module in slhc ppp_generic pppox pppoe; do
 	/sbin/insmod $module 2>&- >&-
 done
 
-IFNAME=$(nvram get ${type}_device)
-USERNAME=$(nvram get ppp_username)
-PASSWORD=$(nvram get ppp_passwd)
-KEEPALIVE=$(nvram get ppp_redialperiod)
-KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 1 lcp-echo-failure $KEEPALIVE}
-DEMAND=$(nvram get ppp_demand)
-case "$DEMAND" in
+eval "IFNAME=\"\${${type}_device}\""
+KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5}
+case "$ppp_demand" in
 	on|1|enabled)
-		DEMAND=$(nvram get ppp_idletime)
-		DEMAND=${IDLETIME:+demand idle $IDLETIME}
+		DEMAND=${ppp_idletime:+demand idle $ppp_idletime}
 		[ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND}
 	;;
 	*) DEMAND="persist";;
 esac
-MTU=$(nvram get ppp_mtu)
-MTU=${MTU:-1492}
+MTU=${ppp_mtu:-1492}
 
 ifconfig $IFNAME up
 /usr/sbin/pppd \
@@ -39,8 +32,8 @@ ifconfig $IFNAME up
 	defaultroute \
 	linkname $type \
 	ipparam $type \
-	user "$USERNAME" \
-	password "$PASSWORD" \
+	user "$ppp_username" \
+	password "$ppp_passwd" \
 	mtu $MTU mru $MTU \
 	$DEMAND \
 	$KEEPALIVE \