diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-06-24 14:41:13 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-06-24 14:42:03 -0400 |
| commit | 9b8912254c817f349c841dcf2f8d6ffa44c06b3b (patch) | |
| tree | 8f8adf9e001ce5ff5cc09b1a2a791644731b5dbb | |
| parent | b518c3cb6958740b042c3b2250f124ac7399c56f (diff) | |
| download | initscripts-9b8912254c817f349c841dcf2f8d6ffa44c06b3b.tar initscripts-9b8912254c817f349c841dcf2f8d6ffa44c06b3b.tar.gz initscripts-9b8912254c817f349c841dcf2f8d6ffa44c06b3b.tar.bz2 initscripts-9b8912254c817f349c841dcf2f8d6ffa44c06b3b.tar.xz initscripts-9b8912254c817f349c841dcf2f8d6ffa44c06b3b.zip | |
Check for dhclient configuration in /etc/dhcp as well (#607764, #607766)
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 4 |
1 files changed, 3 insertions, 1 deletions
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=''; |