From 4732fcfae33ca085284cca2aca45978e549b246a Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 19 Apr 2002 16:34:53 +0000
Subject: bulletproof it - handle both locations

---
 initscripts.spec                 | 2 +-
 sysconfig/network-scripts/ifdown | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index 77b14b08..f92df7f4 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -17,7 +17,7 @@ Requires: bash >= 2.0, SysVinit
 Requires: /sbin/ip, /sbin/arping, net-tools
 Requires: /sbin/update
 Conflicts: kernel <= 2.2, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
-Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, dhcpcd < 1.3.22pl1
+Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12
 Obsoletes: rhsound sapinit
 Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils
 BuildPrereq: glib-devel popt
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index bcbab1f0..a646ff70 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -70,8 +70,13 @@ fi
 retcode=0
 if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
 	[ -n "`pidof -x dhcpcd`" ] && {
-		kill `cat /etc/dhcpc/dhcpcd-${DEVICE}.pid`
-		retcode=$?
+		if [ -f "/etc/dhcpc/dhcpcd-${DEVICE}.pid" ]; then
+		   kill `cat /etc/dhcpc/dhcpcd-${DEVICE}.pid` >/dev/null 2>&1
+		   retcode=$?
+		elif [ -f "/var/run/dhcpcd-${DEVICE}.pid" ]; then
+		   kill `cat /var/run/dhcpcd-${DEVICE}.pid` >/dev/null 2>&1
+		   retcode=$?
+		fi
 	}	
 	[ -n "`pidof -x pump`" ] && {
 	 	pump -r -i ${DEVICE}
-- 
cgit v1.2.1