From c57f6436cc27a9cb02c421ac435b561225f84d7b Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 1 Feb 2005 02:38:53 +0000
Subject: handle saved resolv.conf on all device types

---
 sysconfig/network-scripts/ifdown-post | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post
index b88e5e3b..ed944950 100755
--- a/sysconfig/network-scripts/ifdown-post
+++ b/sysconfig/network-scripts/ifdown-post
@@ -8,13 +8,15 @@ cd /etc/sysconfig/network-scripts
 CONFIG=$1
 source_config
 
-if [ "${DEVICETYPE}" = "ppp" -o "${DEVICETYPE}" = "ippp" ]; then
+if [ "$PEERDNS" != "no" -o -n "$RESOLV_MODS" -a "$RESOLV_MODS" != "no" ]; then
     if [ -f /etc/resolv.conf.save ]; then
 	change_resolv_conf /etc/resolv.conf.save
 	rm -f /etc/resolv.conf.save
     fi
-    if [ -f /etc/ppp/peers/$DEVICE ] ; then
-	rm -f /etc/ppp/peers/$DEVICE
+    if [ "${DEVICETYPE}" = "ppp" -o "${DEVICETYPE}" = "ippp" ]; then
+        if [ -f /etc/ppp/peers/$DEVICE ] ; then
+	    rm -f /etc/ppp/peers/$DEVICE
+        fi
     fi
 fi
 
-- 
cgit v1.2.1