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/servconfig | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

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

diff --git a/src/initramfs/scripts/bin/servconfig b/src/initramfs/scripts/bin/servconfig
index 1248918e..8866d91e 100755
--- a/src/initramfs/scripts/bin/servconfig
+++ b/src/initramfs/scripts/bin/servconfig
@@ -123,15 +123,28 @@ else
 fi
 # set up domainname and resolving
 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} >/mnt/etc/resolv.conf
-test -n "${domain_name_servers}" && {
+
+out=/mnt/etc/resolv.conf
+echo -e "# /etc/resolv.conf - file generated by\n#\t$0:\n\
+#\t${date}\n#options timeout:1 attempts:1 rotate" > $out
+
+[ -n ${domain_name} ]   && echo -e "domain ${domain_name}"   >> $out
+[ -n ${domain_search} ] && echo -e "search ${domain_search}" >> $out
+#fallback
+[ ! -n ${domain_search} ] && [ -n ${domain_name} ] && \
+  echo -e "search ${domain_name}" >> $out
+
+[ -n "${domain_name_servers}" ] && {
   for name in ${domain_name_servers}; do
-    echo nameserver ${name} >>/mnt/etc/resolv.conf;
+    echo nameserver ${name} >> $out;
   done; }
 
+unset out
+
+# create hostname file
+[ -n ${host_name} ] && [ -n ${domain_name} ] && \
+  echo "${host_name}.${domain_name}" > /mnt/etc/hostname
+
 #############################################################################
 # run distro specific configuration function
 config_distro
-- 
cgit v1.2.3-55-g7522