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:10 -0400 |
| commit | 68dd8e6978fb891473655eaa9e5bdf54675cdf81 (patch) | |
| tree | 5101bd5611aa6c143906035e776eebc18b2d0800 | |
| parent | 3fac2fff94b413fcdb3696c9d0341aabc5631714 (diff) | |
| download | initscripts-68dd8e6978fb891473655eaa9e5bdf54675cdf81.tar initscripts-68dd8e6978fb891473655eaa9e5bdf54675cdf81.tar.gz initscripts-68dd8e6978fb891473655eaa9e5bdf54675cdf81.tar.bz2 initscripts-68dd8e6978fb891473655eaa9e5bdf54675cdf81.tar.xz initscripts-68dd8e6978fb891473655eaa9e5bdf54675cdf81.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 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=''; |