aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-06-24 14:41:13 -0400
committerBill Nottingham <notting@redhat.com>2010-06-24 14:41:13 -0400
commit774d0703bca0e21439f162b54999861bb0063be9 (patch)
tree9448b07d9e2e46e76c0dec95b98f7ea98026df7a /sysconfig
parentd230d3e6d652b8af7492483c1ea5e1d9de13b78b (diff)
downloadinitscripts-774d0703bca0e21439f162b54999861bb0063be9.tar
initscripts-774d0703bca0e21439f162b54999861bb0063be9.tar.gz
initscripts-774d0703bca0e21439f162b54999861bb0063be9.tar.bz2
initscripts-774d0703bca0e21439f162b54999861bb0063be9.tar.xz
initscripts-774d0703bca0e21439f162b54999861bb0063be9.zip
Check for dhclient configuration in /etc/dhcp as well (#607764, #607766)
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifup-eth4
1 files changed, 3 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 0fc8340b..cae00783 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -170,7 +170,9 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
fi;
# allow users to use generic '/etc/dhcp/dhclient.conf' (as documented in manpage!)
# if per-device file doesn't exist or is empty
- if [ -s /etc/dhclient-${DEVICE}.conf ]; then
+ if [ -s /etc/dhcp/dhclient-${DEVICE}.conf ]; then
+ DHCLIENTCONF="-cf /etc/dhcp/dhclient-${DEVICE}.conf";
+ elif [ -s /etc/dhclient-${DEVICE}.conf ]; then
DHCLIENTCONF="-cf /etc/dhclient-${DEVICE}.conf";
else
DHCLIENTCONF='';