From e776fdd1ea74a05c057f9d18a3bb09b3849a2c4b Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 12 Dec 2000 08:10:37 +0000
Subject: honor PEERDNS=no for pump and dhcpcd too (#18619)

---
 sysconfig.txt                  | 2 +-
 sysconfig/network-scripts/ifup | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sysconfig.txt b/sysconfig.txt
index 2ff1cb83..9e055206 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -358,7 +358,7 @@ Files in /etc/sysconfig/network-scripts/
     MTU=
     PEERDNS=yes|no
       modify /etc/resolv.conf if peer uses msdns extension (PPP only) or
-      DNS{1,2} are set, default to "yes".
+      DNS{1,2} are set, or if using pump or dhcpcd. default to "yes".
     DNS{1,2}=<ipaddress>
       provide DNS addresses that are dropped into the resolv.conf
       file if PEERDNS is not set to "no".
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 63a89fff..b232f0c1 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -98,6 +98,10 @@ if [ -n "${DYNCONFIG}" ]; then
        PUMPARGS="${PUMPARGS} --lookup-hostname"
        DHCPCDARGS="${DHCPCDARGS} -H"
     fi
+    if [ "${PEERDNS}" = "no" ]; then
+       PUMPARGS="${PUMPARGS} -d"
+       DHCPDARGS="${DHCPDARGS -R"
+    fi
     echo -n "Determining IP information for ${DEVICE}..."
     if /sbin/pump ${PUMPARGS} -i ${DEVICE} ; then
 	echo " done."
-- 
cgit v1.2.1