X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fnetwork;h=a891de2630a683b9c12c48203a0486a047f00504;hp=6823826d72c586a1f2ff769c862beb5aa78527fa;hb=bf7c473f7b0b0231854ed00e633322b25c5a247b;hpb=c9e1c143a246343e516be32e43d06f35c99fd9d8

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 6823826d72..a891de2630 100644
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -14,10 +14,11 @@
 
 . /etc/sysconfig/rc
 . ${rc_functions}
-eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/vpn/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
-eval $(/usr/local/bin/readhash /var/ipfire/vpn/settings)
+
 
 case "${1}" in
 	start)
@@ -73,9 +74,22 @@ case "${1}" in
 			name=orange /etc/rc.d/init.d/net/ifup
 		fi
 		
+		# Start DNSMASQ with defaults
+		killall -KILL dnsmasq 2> /dev/null
+		sleep 1
+		if [ "$DOMAIN_NAME_GREEN" == "" ]; then
+			/usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases
+		else 
+			/usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases -s "$DOMAIN_NAME_GREEN"
+		fi
+		
 		# RED
 		if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
-			name=red /etc/rc.d/init.d/net/ifup
+			if [ "$AUTOCONNECT" == "off" ]; then
+				echo -n		# Do anything
+			else
+				name=red /etc/rc.d/init.d/net/ifup
+			fi
 		fi
 		;;