From b909aab0499c76cd4cf91d5efbc4d6c93a5140ce Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Jan 18 2011 17:02:35 +0000 Subject: dhclient-script: another fix for checking for other running dhclient --- diff --git a/dhclient-script b/dhclient-script index 04b9ff6..bcdcb89 100644 --- a/dhclient-script +++ b/dhclient-script @@ -750,7 +750,7 @@ case "${reason}" in dhclient_script_PID="$$" dhclient_PID="${PPID}" 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 change_resolv_conf ${SAVEDIR}/resolv.conf.predhclient.${interface} rm -f ${SAVEDIR}/resolv.conf.predhclient.${interface} diff --git a/dhcp.spec b/dhcp.spec index fee5584..e5830e8 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -313,6 +313,7 @@ rm bind/bind.tar.gz %patch35 -p1 -b .omapi # Fix loading of configuration when LDAP is used (#668276) +# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #22888]) %patch36 -p1 -b .ldap-configuration # Copy in the Fedora/RHEL dhclient script