From 68dd8e6978fb891473655eaa9e5bdf54675cdf81 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 24 Jun 2010 14:41:13 -0400 Subject: Check for dhclient configuration in /etc/dhcp as well (#607764, #607766) --- sysconfig/network-scripts/ifup-eth | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sysconfig') diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index e42ddb4a..6c365721 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -175,7 +175,9 @@ if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then fi; # allow users to use generic '/etc/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=''; -- cgit v1.2.1