X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-netbase.sh;fp=scripts%2Fboot%2F9990-netbase.sh;h=496c3ff1d6e1389341e9bb1a516fadde57355c84;hb=3b9aa28dd04d694d49a07cf4d13fc8c704891f5b;hp=b3f886c943a01e0be7d0513960bce7e4e2936132;hpb=659360c19ad0a28a430545149fc2c4f834d11007;p=live-boot-grml.git

diff --git a/scripts/boot/9990-netbase.sh b/components/9990-netbase.sh
similarity index 86%
rename from scripts/boot/9990-netbase.sh
rename to components/9990-netbase.sh
index b3f886c..496c3ff 100755
--- a/scripts/boot/9990-netbase.sh
+++ b/components/9990-netbase.sh
@@ -109,27 +109,22 @@ EOF
 				# create a resolv.conf if it is not present or empty
 				cp /netboot.config /root/var/log/netboot.config
 
-				rc_search=$(cat netboot.config | awk '/domain/{print $3}')
-				rc_server0=$(cat netboot.config | awk '/dns0/{print $5}')
-				rc_server1=$(cat netboot.config | awk '/dns0/{print $8}')
-				rc_server0="nameserver ${rc_server0}"
-
-				if [ "${rc_server1}" = "0.0.0.0" ]
-				then
-					rc_server1=""
-				else
-					rc_server1="nameserver ${rc_server1}"
-				fi
+				rc_search=$(cat netboot.config | awk '/domain/ { print $3 }')
+				rc_server0="$(cat netboot.config | awk '/dns0/ { print $5 }')"
 
 cat > /root/etc/resolv.conf << EOF
-# /etc/resolv.conf
-# Autogenerated by live-boot
 search ${rc_search}
 domain ${rc_search}
-${rc_server0}
-${rc_server1}
+nameserver ${rc_server0}
 EOF
 
+				rc_server1=$(cat netboot.config | awk '/dns0/ { print $8 }')
+
+				if [ "${rc_server1}" ! = "0.0.0.0" ]
+				then
+					echo "nameserver ${rc_server1}" >> /root/etc/resolv.conf
+				fi
+
 				cat /root/etc/resolv.conf >> /root/var/log/netboot.config
 			fi
 		fi