From b7801a7e92dc7fce2d4b4a2b502b3e9ac40e3ed3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 9 Aug 2001 06:00:22 +0000
Subject: behave sanely if ifup is called with dhcpcd already running (#49392,
 #51038)

---
 sysconfig/network-scripts/ifup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index ec320fd6..0ea87418 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -150,7 +150,7 @@ fi
 			     
 if [ -n "${DYNCONFIG}" ]; then
     PUMPARGS=$PUMPARGS
-    DHCPCDARGS=$DHCPCDARGS
+    DHCPCDARGS="$DHCPCDARGS -n"
     if [ -n "${DHCP_HOSTNAME}" ]; then
        PUMPARGS="-h ${DHCP_HOSTNAME}"
        DHCPCDARGS="-h ${DHCP_HOSTNAME}"
@@ -175,7 +175,7 @@ if [ -n "${DYNCONFIG}" ]; then
     
     if [ -x /sbin/dhcpcd ] && /sbin/dhcpcd ${DHCPCDARGS} ${DEVICE} ; then
 	echo $" done."
-    elif [ -x /sbin/pump ] && /sbin/pump ${PUMPARGS} -i ${DEVICE}; then
+    elif [ -z "`pidof -x dhcpcd`" ] && [ -x /sbin/pump ] && /sbin/pump ${PUMPARGS} -i ${DEVICE}; then
 	echo $" done."
     else
 	echo $" failed."
-- 
cgit v1.2.1