packages: dhcp/dhcp.init, dhcp/dhcp6.init - skip if appropriate network fam...

[glen]

Author: glen                         Date: Thu Nov 19 21:26:35 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- skip if appropriate network family is disabled

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

---- Diffs:

================================================================
Index: packages/dhcp/dhcp.init
diff -u packages/dhcp/dhcp.init:1.25 packages/dhcp/dhcp.init:1.26
--- packages/dhcp/dhcp.init:1.25	Thu Nov 19 21:38:47 2009
+++ packages/dhcp/dhcp.init	Thu Nov 19 22:26:30 2009
@@ -14,7 +14,7 @@
 [ -f /etc/sysconfig/dhcpd ] && . /etc/sysconfig/dhcpd
 
 # Check that networking is up.
-if is_yes "${NETWORKING}"; then
+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

================================================================
Index: packages/dhcp/dhcp6.init
diff -u packages/dhcp/dhcp6.init:1.9 packages/dhcp/dhcp6.init:1.10
--- packages/dhcp/dhcp6.init:1.9	Thu Nov 19 22:22:29 2009
+++ packages/dhcp/dhcp6.init	Thu Nov 19 22:26:30 2009
@@ -14,7 +14,7 @@
 [ -f /etc/sysconfig/dhcpd ] && . /etc/sysconfig/dhcpd
 
 # Check that networking is up.
-if is_yes "${NETWORKING}"; then
+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
================================================================

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