- allow multiple dhclient instances running on one machine

svn-id: @11557

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 56e03c58b467fb9f09af519ee1ecbfa6a16ac0fc..8f685efd7ccbaace11c57ca8c635a1ff909fb45c 100755 (executable)
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -87,7 +87,11 @@ if [ -n "$BOOTPROTO" -a "$BOOTPROTO" != "none" -a "$BOOTPROTO" != "static" ]; th
                        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

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index ba73dedcf6ceee2b8fe8e0dd566551f1cfec505c..598f44c66f8ceae0d811b0e1b97f6328ea895c63 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -160,7 +160,7 @@ if [ -n "$BOOTPROTO" -a "$BOOTPROTO" != "none" -a "$BOOTPROTO" != "static" ]; th
                                ;;
                          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"