- allow per-interface configuration files for dhclient.conf – single config

  file with 'interface' directive(s) conflicts with interface name given on
  the command line.

svn-id: @11714

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 598f44c66f8ceae0d811b0e1b97f6328ea895c63..4b613504cb89ffb594127bf4329a0078a19547e2 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -161,6 +161,9 @@ if [ -n "$BOOTPROTO" -a "$BOOTPROTO" != "none" -a "$BOOTPROTO" != "static" ]; th
                          dhclient)
                                # Can't specify a host with dhclient ?
                                DHCP_ARGS="$DEVICE -pf /var/run/dhclient.$DEVICE.pid -lf /var/lib/dhclient/dhclient.$DEVICE.leases"
+                               if [ -f /etc/dhclinet.$DEVICE.conf ] ; then
+                                       DHCP_ARGS="$DHCP_ARGS -cf /etc/dhclinet.$DEVICE.conf"
+                               fi
                                ;;
                          avahi-autoipd)
                                DHCP_ARGS="-D $DEVICE"