- cleaning

Changed files:
    dhcp-relay.init -> 1.13
    dhcp.init -> 1.10

diff --git a/dhcp-relay.init b/dhcp-relay.init
index f47e3e0163485bef39caade133fe31a8c3f92349..f56a1f7ca597e7fdf1cd8b854333490f1c5940eb 100644 (file)
--- a/dhcp-relay.init
+++ b/dhcp-relay.init
@@ -14,9 +14,13 @@
 . /etc/sysconfig/dhcp-relay
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_network_down "DHCP realay"
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down "DHCP realay"
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 if [ -n "DHCP_REALY_INTERFACES" ]; then

diff --git a/dhcp.init b/dhcp.init
index 06abc5ccb28211d117292516f58b8d3544698f96..ebf709e77fd8b66095ac136a1ae358d4e073809a 100644 (file)
--- a/dhcp.init
+++ b/dhcp.init
@@ -14,9 +14,13 @@
 [ -f /etc/sysconfig/dhcpd ] && . /etc/sysconfig/dhcpd
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_network_down DHCPD
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network ]; then
+               msg_network_down DHCPD
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 # See how we were called.