diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 4 |
3 files changed, 6 insertions, 8 deletions
@@ -4,11 +4,9 @@ * rc.d/rc.sysinit: fix stupid cut&paste error - -2002-04-17 Preston Brown <pbrown@redhat.com> - - * sysconfig/network-scripts/ifdown: - make sure that PID file exists and is readable before trying to read from it. + + * sysconfig/network-scripts/ifdown, initscripts.spec: + fix path to dhcpcd config file, conflict with older dhcpcd versions 2002-04-15 Trond Eivind Glomsrod <teg@redhat.com> diff --git a/initscripts.spec b/initscripts.spec index f92df7f4..77b14b08 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 +Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, dhcpcd < 1.3.22pl1 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 6aa00b61..bcbab1f0 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -69,8 +69,8 @@ fi retcode=0 if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then - [ -n "`pidof -x dhcpcd`" && -r "/var/run/dhcpcd-${DEVICE}.pid" ] && { - kill `cat /var/run/dhcpcd-${DEVICE}.pid` + [ -n "`pidof -x dhcpcd`" ] && { + kill `cat /etc/dhcpc/dhcpcd-${DEVICE}.pid` retcode=$? } [ -n "`pidof -x pump`" ] && { |