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

[jajcus]

Author: jajcus
Date: Tue Jun 15 12:13:06 2010
New Revision: 11557

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/ifdown
   rc-scripts/trunk/sysconfig/network-scripts/ifup
Log:
- allow multiple dhclient instances running on one machine


Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown	Tue Jun 15 12:13:06 2010
@@ -87,7 +87,11 @@
 			RESULT=$?
 			;;
 		  dhclient)
-			if [ -f /var/run/dhclient.pid ];then
+		  	if [ -f "/var/run/dhclient.$DEVICE.pid" ] ; then
+				$DHCP_CLIENT -r -pf /var/run/dhclient.$DEVICE.pid -lf /var/lib/dhclient/dhclient.$DEVICE.leases 2>/dev/null
+				RESULT=$?
+			elif [ -f /var/run/dhclient.pid ]; then
+				# may be left by older rc-scripts
 				PID=$(cat /var/run/dhclient.pid)
 				if kill -0 $PID 2>/dev/null; then
 					kill $PID

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup	Tue Jun 15 12:13:06 2010
@@ -160,7 +160,7 @@
 				;;
 			  dhclient)
 				# Can't specify a host with dhclient ?
-				DHCP_ARGS="$DEVICE"
+				DHCP_ARGS="$DEVICE -pf /var/run/dhclient.$DEVICE.pid -lf /var/lib/dhclient/dhclient.$DEVICE.leases"
 				;;
 			  avahi-autoipd)
 				DHCP_ARGS="-D $DEVICE"