packages: dhcp/dhcp.init, dhcp/dhcp6.init - check networking very early

[glen]

Author: glen                         Date: Thu Nov 19 21:28:17 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- check networking very early

---- Files affected:
packages/dhcp:
   dhcp.init (1.26 -> 1.27) , dhcp6.init (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/dhcp/dhcp.init
diff -u packages/dhcp/dhcp.init:1.26 packages/dhcp/dhcp.init:1.27
--- packages/dhcp/dhcp.init:1.26	Thu Nov 19 22:26:30 2009
+++ packages/dhcp/dhcp.init	Thu Nov 19 22:28:12 2009
@@ -10,17 +10,17 @@
 # Get network config
 . /etc/sysconfig/network
 
+# Check that networking is up.
+if ! is_yes "${IPV4_NETWORKING}"; then
+	exit 0
+fi
+
 # Get service config
 [ -f /etc/sysconfig/dhcpd ] && . /etc/sysconfig/dhcpd
 
-# Check that networking is up.
-if is_yes "${IPV4_NETWORKING}"; then
-	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down "DHCP Server"
-		exit 1
-	fi
-else
-	exit 0
+if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+	msg_network_down "DHCP Server"
+	exit 1
 fi
 
 check_device_up()

================================================================
Index: packages/dhcp/dhcp6.init
diff -u packages/dhcp/dhcp6.init:1.10 packages/dhcp/dhcp6.init:1.11
--- packages/dhcp/dhcp6.init:1.10	Thu Nov 19 22:26:30 2009
+++ packages/dhcp/dhcp6.init	Thu Nov 19 22:28:12 2009
@@ -10,17 +10,17 @@
 # Get network config
 . /etc/sysconfig/network
 
+# Check that networking is up.
+if ! is_yes "${IPV6_NETWORKING}"; then
+	exit 0
+fi
+
 # Get service config
 [ -f /etc/sysconfig/dhcpd ] && . /etc/sysconfig/dhcpd
 
-# Check that networking is up.
-if is_yes "${IPV6_NETWORKING}"; then
-	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down "DHCP IPv6 Server"
-		exit 1
-	fi
-else
-	exit 0
+if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+	msg_network_down "DHCP IPv6 Server"
+	exit 1
 fi
 
 check_device_up()
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp.init?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp6.init?r1=1.10&r2=1.11&f=u