rpms/dhcp/devel dhcp.spec,1.179,1.180 linux,1.7,1.8

[David Cantrell (dcantrel)]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10010

Modified Files:
	dhcp.spec linux 
Log Message:
* Thu Oct 25 2007 David Cantrell <dcantrell at redhat.com> - 12:3.1.0-5
- Remove chkconfig usage for ypbind in dhclient-script (#351211)
- Combine dhcp-static and dhcp-devel packages since there are no shared
  libraries offered
- Remove Requires: openldap-devel on dhcp-devel and libdhcp4client-devel
- Make libdhcp4client-devel require dhcp-devel (for libdhcp_control.h)
- Do not make dhcp-devel require the dhcp package, those are independent



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- dhcp.spec	25 Oct 2007 15:34:15 -0000	1.179
+++ dhcp.spec	25 Oct 2007 15:39:53 -0000	1.180
@@ -429,6 +429,7 @@
 
 %changelog
 * Thu Oct 25 2007 David Cantrell <dcantrell at redhat.com> - 12:3.1.0-5
+- Remove chkconfig usage for ypbind in dhclient-script (#351211)
 - Combine dhcp-static and dhcp-devel packages since there are no shared
   libraries offered
 - Remove Requires: openldap-devel on dhcp-devel and libdhcp4client-devel


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/linux,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux	8 Oct 2007 17:58:17 -0000	1.7
+++ linux	25 Oct 2007 15:39:53 -0000	1.8
@@ -351,14 +351,7 @@
             let contents=contents+1
         fi
 
-        level=$(/sbin/runlevel)
-        level=${level##*\ }
-
-        if [ "$level" = "unknown" ]; then
-            level=1
-        fi
-
-        if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=$(cat /var/run/ypbind.pid) && [ -d /proc/${yppid} ] && [ "$(if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi)" = "/sbin/ypbind" ]; then
+        if [ $contents -gt 0 ] && [ -r /var/run/ypbind.pid ] && yppid=$(cat /var/run/ypbind.pid) && [ -d /proc/${yppid} ] && [ "$(if [ -x /usr/bin/readlink ]; then readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi)" = "/sbin/ypbind" ]; then
             kill -HUP $yppid
         fi
     elif [ -n "$new_nis_servers" ]; then
@@ -371,14 +364,7 @@
             let contents=contents+1
         done
 
-        level=$(/sbin/runlevel)
-        level=${level##*\ }
-
-        if [ "$level" = "unknown" ]; then
-            level=1
-        fi
-
-        if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=$(cat /var/run/ypbind.pid) && [ -d /proc/${yppid} ] && [ "$(if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi)" = "/sbin/ypbind" ] ; then
+        if [ $contents -gt 0 ] && [ -r /var/run/ypbind.pid ] && yppid=$(cat /var/run/ypbind.pid) && [ -d /proc/${yppid} ] && [ "$(if [ -x /usr/bin/readlink ]; then readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi)" = "/sbin/ypbind" ]; then
             kill -HUP $yppid
         fi
     fi
@@ -516,16 +502,10 @@
     if [ -f /etc/yp.conf.predhclient ]; then
         /bin/rm -f /etc/yp.conf
         /bin/mv -f /etc/yp.conf.predhclient /etc/yp.conf
-        level=$(/sbin/runlevel)
-        level=${level##*\ }
 
-       if [ "$level" = "unknown" ]; then
-           level=1
-       fi
-
-       if [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=$(cat /var/run/ypbind.pid) && [ -d /proc/${yppid} ] && [ "$(if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi)" = "/sbin/ypbind" ] ; then
+        if [ -r /var/run/ypbind.pid ] && yppid=$(cat /var/run/ypbind.pid) && [ -d /proc/${yppid} ] && [ "$(if [ -x /usr/bin/readlink ]; then readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi)" = "/sbin/ypbind" ]; then
            kill -HUP $yppid
-       fi
+        fi
     fi
 
     if [ -x /etc/dhclient-${interface}-down-hooks ]; then