rpms/dhcp/F-8 dhcp.spec,1.175,1.176 linux,1.7,1.8

[David Cantrell (dcantrel)]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22297

Modified Files:
	dhcp.spec linux 
Log Message:
* Thu Oct 25 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-11
- Remove chkconfig usage for ypbind in dhclient-script (#351211)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-8/dhcp.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- dhcp.spec	24 Oct 2007 17:54:05 -0000	1.175
+++ dhcp.spec	25 Oct 2007 19:10:34 -0000	1.176
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  10%{?dist}
+Release:  11%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -432,6 +432,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Thu Oct 25 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-11
+- Remove chkconfig usage for ypbind in dhclient-script (#351211)
+
 * Wed Oct 24 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-10
 - Fix 'restart' mode in init script (#349341)
 - Make sure restorecon is run on /var/lib/dhcpd/dhcpd.leases (#251688)


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-8/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 19:10:34 -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