From: Warren Togami <wtogami@redhat.com>
Date: Thu, 30 Jul 2009 13:27:09 +0000 (-0400)
Subject: There is only one resolv.conf.
X-Git-Tag: 0.8~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=984a819b923badd95cd201eb8ad70cf366e668f5;p=thirdparty%2Fdracut.git

There is only one resolv.conf.
---

diff --git a/modules.d/40network/dhclient-script b/modules.d/40network/dhclient-script
index 1ef239aad..a86695236 100755
--- a/modules.d/40network/dhclient-script
+++ b/modules.d/40network/dhclient-script
@@ -23,12 +23,12 @@ setup_interface() {
 
     [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
 
-    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
+    [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/resolv.conf
     if  [ -n "$namesrv" ] ; then
 	for s in $namesrv; do
 	    echo nameserver $s 
 	done
-    fi >> /tmp/net.$netif.resolv.conf
+    fi >> /tmp/resolv.conf
 
     [ -n "$hostname" ] && echo hostname $hostname > /tmp/net.$netif.hostname
 }
diff --git a/modules.d/40network/netroot b/modules.d/40network/netroot
index f719d93bc..3b343afa8 100755
--- a/modules.d/40network/netroot
+++ b/modules.d/40network/netroot
@@ -90,7 +90,7 @@ done
 
 [ -e /tmp/net.$netif.gw ]          && . /tmp/net.$netif.gw
 [ -e /tmp/net.$netif.hostname ]    && . /tmp/net.$netif.hostname
-[ -e /tmp/net.$netif.resolv.conf ] && cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
+[ -e /tmp/resolv.conf ] && cp -f /tmp/resolv.conf /etc/resolv.conf
 
 # Source netroot hooks before we start the handler
 source_all netroot
diff --git a/modules.d/99base/init b/modules.d/99base/init
index 485cc2da7..ab75e2573 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -223,6 +223,7 @@ if getarg rdcopystate; then
     cp /tmp/* /dev/.initramfs/ >/dev/null 2>&1
 else
     cp /tmp/net.* /dev/.initramfs/ >/dev/null 2>&1
+    cp /tmp/resolv.conf /dev/.initramfs/ >/dev/null 2>&1
     cp -a /tmp/ifcfg/ /dev/.initramfs/ >/dev/null 2>&1
 fi