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

1 files changed, 16 insertions, 25 deletions

diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp
index 9b1ac07c26..a9bc579b56 100644
--- a/package/pptp/files/ifup.pptp
+++ b/package/pptp/files/ifup.pptp
@@ -1,8 +1,13 @@
 #!/bin/sh
-. /etc/functions.sh
+[ $# = 0 ] && { echo "  $0 <group>"; exit; }
+. /etc/config/network
 type=$1
 
-[ "$(nvram get ${type}_proto)" = "pptp" ] || exit
+eval "proto=\"\${${type}_proto}\""
+[ "$proto" = "pptp" ] || {
+	echo "$0: ${type}_proto isn't pptp"
+	exit
+}
 
 [ -d "/var/lock" ] || mkdir -p /var/lock || exit 1
 
@@ -10,35 +15,21 @@ for module in slhc ppp_generic ppp_async ip_gre; do
 	/sbin/insmod $module 2>&- >&-
 done
 
-PPTP_PROTO="$(nvram get pptp_proto)"
-[ "$PPTP_PROTO" = "static" ] || PPTP_PROTO=""
-PPTP_PROTO="${PPTP_PROTO:-dhcp}"
-IP=$(nvram get pptp_server_ip)
-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
+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:-1452}
+MTU=${ppp_mtu:-1452}
 
-do_ifup $PPTP_PROTO $type
-
-# hack for some buggy ISPs
-NETMASK=$(nvram get ${type}_netmask)
-IFNAME=$(nvram get ${type}_device)
-[ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK
+[ "$pptp_proto" = "static" ] || pptp_proto="dhcp"
+do_ifup $pptp_proto $type
 
 /usr/sbin/pppd \
-	pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \
+	pty "/usr/sbin/pptp $pptp_server_ip --loglevel 0 --nolaunchpppd" \
 	file /etc/ppp/options.pptp \
 	connect /bin/true \
 	usepeerdns \
@@ -46,8 +37,8 @@ IFNAME=$(nvram get ${type}_device)
 	replacedefaultroute \
 	linkname "$type" \
 	ipparam "$type" \
-	user "$USERNAME" \
-	password "$PASSWORD" \
+	user "$ppp_username" \
+	password "$ppp_passwd" \
 	mtu $MTU mru $MTU \
 	$DEMAND \
 	$KEEPALIVE