From c2fe554422ea22180384b5751a427f5c60ba9d34 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 9 Aug 2001 05:52:52 +0000
Subject: just kill dhcpcd, don't use dhcpcd -k. also, allow setting of
 additional pump & dhcpcd arguments (#46942)

---
 sysconfig/network-scripts/ifdown | 2 +-
 sysconfig/network-scripts/ifup   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 9ff1cfde..69ea3670 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -73,7 +73,7 @@ fi
 retcode=0
 if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
 	[ -n "`pidof -x dhcpcd`" ] && {
-		dhcpcd -k ${DEVICE}
+		killall dhcpcd
 		retcode=$?
 	}	
 	[ -n "`pidof -x pump`" ] && {
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index db3c6205..ec320fd6 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -149,8 +149,8 @@ if [ -f /etc/sysconfig/ipchains -a \
 fi
 			     
 if [ -n "${DYNCONFIG}" ]; then
-    PUMPARGS=
-    DHCPCDARGS=
+    PUMPARGS=$PUMPARGS
+    DHCPCDARGS=$DHCPCDARGS
     if [ -n "${DHCP_HOSTNAME}" ]; then
        PUMPARGS="-h ${DHCP_HOSTNAME}"
        DHCPCDARGS="-h ${DHCP_HOSTNAME}"
-- 
cgit v1.2.1