From 09f3739f065703adf268e1d6df48556b430a9dd5 Mon Sep 17 00:00:00 2001
From: Trond Eivind Glomsrod <teg@redhat.com>
Date: Thu, 28 Jun 2001 22:38:14 +0000
Subject: Remove pump usage

---
 initscripts.spec               | 4 ++--
 sysconfig/network-scripts/ifup | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index 5edcea4b..be01e255 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 5.95
+Version: 5.96
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -223,7 +223,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Thu Jun 28 2001 Trond Eivind Glomsrød <teg@redhat.com>
-- Use dhcpcd as default instead of pump
+- Disable pump completely
 
 * Wed Jun 27 2001 Than Ngo <than@redhat.com>
 - fix pap/chap authentication for syncppp
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 5d09bd09..25e24860 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -137,18 +137,14 @@ if [ -f /etc/sysconfig/ipchains -a \
 fi
 			     
 if [ -n "${DYNCONFIG}" ]; then
-    PUMPARGS=
     DHCPCDARGS=
     if [ -n "${DHCP_HOSTNAME}" ]; then
-       PUMPARGS="-h ${DHCP_HOSTNAME}"
        DHCPCDARGS="-h ${DHCP_HOSTNAME}"
     fi
     if [ -n "${NEEDHOSTNAME}" ]; then
-       PUMPARGS="${PUMPARGS} --lookup-hostname"
        DHCPCDARGS="${DHCPCDARGS} -H"
     fi
     if [ "${PEERDNS}" = "no" ]; then
-       PUMPARGS="${PUMPARGS} -d"
        DHCPCDARGS="${DHCPCDARGS} -R"
     fi
     echo -n $"Determining IP information for ${DEVICE}..."
@@ -167,8 +163,6 @@ 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
-	echo $" done."
     else
 	echo $" failed."
 	[ -n "$FWHACK" ] && ipchains -D input -s 0/0 53 -p udp -j ACCEPT
-- 
cgit v1.2.1