From d18fa35d37a906cc088bae4cd19304be59c471ce Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Thu, 26 May 2011 17:46:01 +0200
Subject: fix for multiple search domains & cosmetics

---
 src/initramfs/scripts/bin/dhcpmkconfig | 6 +++---
 src/initramfs/scripts/bin/servconfig   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/initramfs')

diff --git a/src/initramfs/scripts/bin/dhcpmkconfig b/src/initramfs/scripts/bin/dhcpmkconfig
index 881a9335..f154d95e 100755
--- a/src/initramfs/scripts/bin/dhcpmkconfig
+++ b/src/initramfs/scripts/bin/dhcpmkconfig
@@ -40,11 +40,11 @@ set | sed \
   -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
+[ -n "$domain" ] && echo -e "domain $domain" >/etc/resolv.conf
 if [ -n "$search" ]; then
-  echo "search $search\n" >>/etc/resolv.conf
+  echo -e "search $search" >>/etc/resolv.conf
 else
-  [ -n "$domain" ] && echo -e "search $domain\n" >>/etc/resolv.conf
+  [ -n "$domain" ] && echo -e "search $domain" >>/etc/resolv.conf
 fi
 test -n "$dns" && {
   for name in $dns; do
diff --git a/src/initramfs/scripts/bin/servconfig b/src/initramfs/scripts/bin/servconfig
index 8866d91e..9b2b9d79 100755
--- a/src/initramfs/scripts/bin/servconfig
+++ b/src/initramfs/scripts/bin/servconfig
@@ -129,9 +129,9 @@ 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
+[ -n "${domain_search}" ] && echo -e "search ${domain_search}" >> $out
 #fallback
-[ ! -n ${domain_search} ] && [ -n ${domain_name} ] && \
+[ ! -n "${domain_search}" ] && [ -n ${domain_name} ] && \
   echo -e "search ${domain_name}" >> $out
 
 [ -n "${domain_name_servers}" ] && {
-- 
cgit v1.2.3-55-g7522