From 2d6c8a3ee15ae8b1c68fbc6e6e36d2d321ee95fe Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 30 Aug 2004 19:12:52 +0000
Subject: move to right branch

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

(limited to 'sysconfig/network-scripts/ifup-post')

diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index 401d1e8c..77b678bc 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -19,9 +19,7 @@ if [ "$PEERDNS" != "no" -o -n "$RESOLV_MODS" -a "$RESOLV_MODS" != "no" ]; then
   [ -n "$MS_DNS1" ] && DNS1=$MS_DNS1
   [ -n "$MS_DNS2" ] && DNS2=$MS_DNS2
   if [ -n "$DNS1" ] && ! grep -q "^nameserver $DNS1" /etc/resolv.conf &&
-   tr=`mktemp /tmp/resolv.XXXXXX` ; then
-    # replace only the first two nameserver lines; cannot count on awk
-    # and do not know if sed is capable of this...
+   tr=`mktemp /tmp/XXXXXX` ; then
     current_replacement="$DNS1"
     next_replacement="$DNS2"
     search=
@@ -67,7 +65,7 @@ if [ "$PEERDNS" != "no" -o -n "$RESOLV_MODS" -a "$RESOLV_MODS" != "no" ]; then
     # but set umask in case it doesn't exist!
     oldumask=`umask`
     umask 022
-    cat $tr > /etc/resolv.conf
+    change_resolv_conf $tr 
     rm -f $tr
     umask $oldumask
   fi
-- 
cgit