aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-11-28 19:40:22 +0000
committerBill Nottingham <notting@redhat.com>2005-11-28 19:40:22 +0000
commitd289ab9d23d1c0bd663b630e1b92e3fc76cc0106 (patch)
tree4c719ae80bf661d0feb69d8628fcb7d364e9ebac /sysconfig
parent3011da5a52561b0b6faeac38e07775451df00435 (diff)
downloadinitscripts-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)
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifdown-eth2
-rwxr-xr-xsysconfig/network-scripts/ifup-eth2
2 files changed, 2 insertions, 2 deletions
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