- check networking very early

Changed files:
    dhcp.init -> 1.27
    dhcp6.init -> 1.11

diff --git a/dhcp.init b/dhcp.init
index cf5b726f88b7078b5cf7f5df657f729a4230c031..476cb93d410cea2e43db2afd0a4c48a818bb3bc0 100644 (file)
--- a/dhcp.init
+++ b/dhcp.init
@@ -10,17 +10,17 @@
 # Get network config
 . /etc/sysconfig/network
 
 # 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
 
 # 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()
 fi
 
 check_device_up()

diff --git a/dhcp6.init b/dhcp6.init
index f378ee33c226c4e70ba45efe91e314716111d073..64686fd105abb355d9237d17be89f254b625e043 100644 (file)
--- a/dhcp6.init
+++ b/dhcp6.init
@@ -10,17 +10,17 @@
 # Get network config
 . /etc/sysconfig/network
 
 # 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
 
 # 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()
 fi
 
 check_device_up()