SVN: rc-scripts/trunk/sysconfig/network-scripts/ifup

[jajcus]

Author: jajcus
Date: Mon Jul 26 15:20:24 2010
New Revision: 11714

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/ifup
Log:
- allow per-interface configuration files for dhclient.conf – single config
  file with 'interface' directive(s) conflicts with interface name given on
  the command line.


Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup	Mon Jul 26 15:20:24 2010
@@ -161,6 +161,9 @@
 			  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"