From 3d293aa2f3252963514212ba25baf2dc139d997d Mon Sep 17 00:00:00 2001
From: Trond Eivind Glomsrod <teg@redhat.com>
Date: Mon, 2 Jul 2001 00:07:34 +0000
Subject: Reenable pump, but make dhcpcd is the default. This makes updates of
 systems without dhcpcd installed easier.

---
 sysconfig/network-scripts/ifup | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 670db6ef..6a418d40 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -137,14 +137,18 @@ 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}..."
@@ -163,6 +167,8 @@ 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