From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Mon, 20 Aug 2007 14:25:59 +0000 (+0000)
Subject: Netzwerkscripts: DHCP vollstaendig getestet und gefixt.
X-Git-Tag: v2.3-beta1~470
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f480386fc6878adabb335f8a1e7bdb16e3cbf3cb;ds=sidebyside

Netzwerkscripts: DHCP vollstaendig getestet und gefixt.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@790 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 583e55ea2c..78b7879ad2 100644
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -15,16 +15,33 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+SHOW_SRV=1
+
 case "${1}" in
 	start)
 		boot_mesg "Starting Domain Name Service Proxy..."
 		
 		eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 		ARGS=
-		[ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN "
-		[ -e "/var/ipfire/red/active" ] && ARGS+="-r /var/ipfire/red/resolv.conf"
+		[ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
+		
+		echo > /var/ipfire/red/resolv.conf # Clear it
+		if [ -e "/var/ipfire/red/dns1" ]; then
+		    DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null)
+		    echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf
+		fi
+		if [ -e "/var/ipfire/red/dns2" ]; then
+		    DNS2=$(cat /var/ipfire/red/dns2 2>/dev/null)
+		    echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf
+		fi
+		[ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"
 		
 		loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
+		
+		if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then
+		    boot_mesg "Using DNS server(s): ${DNS1} ${DNS2}"
+		    boot_mesg_flush
+		fi
 		;;
 
 	stop)
diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index 5349960cb2..dca1b83399 100644
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/src/initscripts/init.d/networking/dhcpcd.exe
@@ -21,7 +21,6 @@ case "$2" in
 	new)	
 		logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with new IP=${IPADDR}"
 		[ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active
-		fi
 		;;
 	down)
 		logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been brought down"
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index d28fd9060a..465d528cc8 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -278,6 +278,7 @@ case "${1}" in
 			fi
 		fi
 		
+		rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
 		for i in $( ls -v ${rc_base}/init.d/networking/red.down/* 2> /dev/null); do
 			check_script_status
 			OUT=$(echo $(basename ${i}) | awk -F- '{ print $2 }')