aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec2
-rwxr-xr-xsysconfig/network-scripts/ifdown-eth2
-rwxr-xr-xsysconfig/network-scripts/ifup-eth2
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