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

dhclient-script: another fix for checking for other running dhclient

Browse Source
This commit is contained in:
Jiri Popelka 2011-01-18 18:02:35 +01:00
parent 99f5023df5
commit b909aab049
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhclient-script
View File

@ -750,7 +750,7 @@ case "${reason}" in
dhclient_script_PID="$$" dhclient_script_PID="$$"
dhclient_PID="${PPID}" dhclient_PID="${PPID}"
any_other_clients=$(ps -eo pid,ppid,comm | grep dhclient | grep -v -E "${dhclient_script_PID}|${dhclient_PID}") any_other_clients=$(ps -eo pid,ppid,comm | grep dhclient | grep -v -E "${dhclient_script_PID}|${dhclient_PID}")
if [ -n "${any_other_clients}" ]; then if [ -z "${any_other_clients}" ]; then
if [ -f ${SAVEDIR}/resolv.conf.predhclient.${interface} ]; then if [ -f ${SAVEDIR}/resolv.conf.predhclient.${interface} ]; then
change_resolv_conf ${SAVEDIR}/resolv.conf.predhclient.${interface} change_resolv_conf ${SAVEDIR}/resolv.conf.predhclient.${interface}
rm -f ${SAVEDIR}/resolv.conf.predhclient.${interface} rm -f ${SAVEDIR}/resolv.conf.predhclient.${interface}

1
dhcp.spec
View File

@ -313,6 +313,7 @@ rm bind/bind.tar.gz
%patch35 -p1 -b .omapi %patch35 -p1 -b .omapi
# Fix loading of configuration when LDAP is used (#668276) # Fix loading of configuration when LDAP is used (#668276)
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #22888])
%patch36 -p1 -b .ldap-configuration %patch36 -p1 -b .ldap-configuration
# Copy in the Fedora/RHEL dhclient script # Copy in the Fedora/RHEL dhclient script