diff options
| author | Bill Nottingham <notting@redhat.com> | 2005-11-28 19:40:22 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2005-11-28 19:40:22 +0000 |
| commit | d289ab9d23d1c0bd663b630e1b92e3fc76cc0106 (patch) | |
| tree | 4c719ae80bf661d0feb69d8628fcb7d364e9ebac | |
| parent | 3011da5a52561b0b6faeac38e07775451df00435 (diff) | |
| download | initscripts-d289ab9d23d1c0bd663b630e1b92e3fc76cc0106.tar initscripts-d289ab9d23d1c0bd663b630e1b92e3fc76cc0106.tar.gz initscripts-d289ab9d23d1c0bd663b630e1b92e3fc76cc0106.tar.bz2 initscripts-d289ab9d23d1c0bd663b630e1b92e3fc76cc0106.tar.xz initscripts-d289ab9d23d1c0bd663b630e1b92e3fc76cc0106.zip | |
use new dhclient file paths, add appropriate conflict (#169164)
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-eth | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec index c1e985ca..e95bea3a 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2, /sbin/nash, /sbin/runuser Conflicts: mkinitrd < 4.0, kernel < 2.6.12 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 -Conflicts: udev < 0:048 +Conflicts: udev < 0:048, dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 #Conflicts: diskdumputils < 1.1.0 Obsoletes: rhsound sapinit diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index ee23d9ef..1150f098 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -60,7 +60,7 @@ retcode=0 if [ -f "/var/run/dhclient-${DEVICE}.pid" ]; then dhcpid=`cat /var/run/dhclient-${DEVICE}.pid` if [[ "$DHCPRELEASE" = [yY1]* ]]; then - /sbin/dhclient -r -lf /var/lib/dhcp/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1 + /sbin/dhclient -r -lf /var/lib/dhclient/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1 retcode=$? else kill $dhcpid >/dev/null 2>&1 diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 5edcb6b8..52827bcc 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -160,7 +160,7 @@ if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then else DHCLIENTCONF=''; fi; - DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhcp/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid" + DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid" echo echo -n $"Determining IP information for ${DEVICE}..." if check_link_down ${DEVICE}; then |