From 9b8912254c817f349c841dcf2f8d6ffa44c06b3b Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
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(-)

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 9e5e4b12..44bddf22 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -175,7 +175,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='';
-- 
cgit v1.2.1