From 6d2ac2a47bc68516a10ce8fde2a035d4bca3a425 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 10 Mar 1999 16:57:50 +0000
Subject: pump actually works now

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

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 94fe5593..6f02c394 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -41,13 +41,8 @@ else
     ISALIAS=no
 fi
 
-if [ "$BOOTPROTO" = dhcp -a "$ISALIAS" = no ]; then
-	if [ -f /var/run/dhcpcd-${DEVICE}.pid ]; then
-		kill `cat /var/run/dhcpcd-${DEVICE}.pid`
-		rm -f /var/run/dhcpcd-${DEVICE}.pid
-		exit 0
-	fi
-	exit 1
+if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
+	pump -r -i ${DEVICE}
 fi
 
 ifconfig ${DEVICE} down
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index be8c48b9..209fd41a 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -49,7 +49,7 @@ if [ "$BOOTP" = "yes" ]; then
     BOOTPROTO=bootp
 fi
 
-if [ "$BOOTPROTO" = bootp -r "$BOOTPROTO" = dhcp ]; then
+if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
     PUMP=true
 fi
 
@@ -78,7 +78,7 @@ if [ "$SLAVE" = yes -a "$ISALIAS" = no -a "$MASTER" != "" -a \
 fi
 
 if [ -n "$PUMP" ]; then
-    echo "Determing IP information for $DEVICE..."
+    echo -n "Determing IP information for $DEVICE..."
     if /sbin/pump -i $DEVICE ; then
 	echo " done."
     else
-- 
cgit v1.2.1