rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Remove chkconfig usage for ypbind in dhclient-script (#351211)

Browse Source 
- 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
This commit is contained in:
David Cantrell 2007-10-25 15:39:53 +00:00
parent 6599f82f02
commit 5c694ad760
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dhcp.spec
View File

@ -429,6 +429,7 @@ fi
%changelog
* Thu Oct 25 2007 David Cantrell <dcantrell@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

28
linux
View File

@ -351,14 +351,7 @@ function dhconfig() {
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 @@ function dhconfig() {
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 [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
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