From 5c0c326408ba0b880ebc640408df8ed7f8f87e00 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 4 Nov 2008 18:07:58 +0000
Subject: added early resolv.conf config for fileget

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2378 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/bin/dhcpmkconfig | 8 ++++++++
 initramfs/stage3-stuff/bin/servconfig   | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/stage3-stuff/bin/dhcpmkconfig b/initramfs/stage3-stuff/bin/dhcpmkconfig
index dd4b704a..aee0eb6d 100755
--- a/initramfs/stage3-stuff/bin/dhcpmkconfig
+++ b/initramfs/stage3-stuff/bin/dhcpmkconfig
@@ -30,3 +30,11 @@ set | sed \
   -e "s,broadcast,broadcast_address,;s,dhc.*,,;/^$/d" \
   -e "s,nissrv,nis_servers,;s,nisdomain_name,nis_domain," \
   -e "s,wins,netbios_name_servers,;/OPTIND.*/d" >>/tmp/confviadhcp
+
+# erzeugen einer lokalen /etc/resolv.conf
+echo -e "search $domain\n" >/etc/resolv.conf
+test -n "$dns" && {
+  for name in $dns; do
+    echo nameserver $name >>/etc/resolv.conf;
+  done; }
+
diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig
index 4591ce8f..7a10a8b5 100755
--- a/initramfs/stage3-stuff/bin/servconfig
+++ b/initramfs/stage3-stuff/bin/servconfig
@@ -124,12 +124,11 @@ rm -rf /mnt/etc/resolv.conf
 test -n "$domain_name" && \
   echo -e "# /etc/resolv.conf - file generated by\n#\t$0:\n\
 #\t$date\n#options timeout:1 attempts:1 rotate\n\
-search "$domain_name >/etc/resolv.conf
+search "$domain_name >/mnt/etc/resolv.conf
 test -n "$domain_name_servers" && {
   for name in $domain_name_servers; do
-    echo nameserver $name >>/etc/resolv.conf;
+    echo nameserver $name >>/mnt/etc/resolv.conf;
   done; }
-cp /etc/resolv.conf /mnt/etc/resolv.conf
 
 #############################################################################
 # run distro specific configuration function
-- 
cgit v1.2.3-55-g7522