From 2aa9f867e01781674c0044a653302c25c4fe0c45 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Thu, 26 May 2011 17:30:32 +0200
Subject: fix hostname / resolv.conf generation

---
 src/initramfs/scripts/bin/dhcpmkconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/initramfs/scripts/bin/dhcpmkconfig')

diff --git a/src/initramfs/scripts/bin/dhcpmkconfig b/src/initramfs/scripts/bin/dhcpmkconfig
index 1c6bc1e7..881a9335 100755
--- a/src/initramfs/scripts/bin/dhcpmkconfig
+++ b/src/initramfs/scripts/bin/dhcpmkconfig
@@ -36,16 +36,20 @@ set | sed \
   -e "s,domain,domain_name,;s,dns,domain_name_servers," \
   -e "s,broadcast,broadcast_address,;s,dhc.*,,;/^$/d" \
   -e "s,nissrv,nis_servers,;s,nisdomain_name,nis_domain," \
+  -e "s,search,domain_search," \
   -e "s,wins,netbios_name_servers,;/OPTIND.*/d" >>/tmp/confviadhcp
 
 # generate a local /etc/resolv.conf (might overwrite the version from preboot)
+[ -n "$domain" ] && echo -e "domain $domain\n" >/etc/resolv.conf
 if [ -n "$search" ]; then
-  echo "search $search\n" >/etc/resolv.conf
+  echo "search $search\n" >>/etc/resolv.conf
 else
-  [ -n "$domain" ] && echo -e "search $domain\n" >/etc/resolv.conf
+  [ -n "$domain" ] && echo -e "search $domain\n" >>/etc/resolv.conf
 fi
 test -n "$dns" && {
   for name in $dns; do
     echo nameserver $name >>/etc/resolv.conf;
   done; }
 
+#generate local /etc/hostname
+echo $hostname.$domain > /etc/hostname
-- 
cgit v1.2.3-55-g7522