Simplifying /etc/resolv.conf generation a bit.

diff --git a/components/9990-netbase.sh b/components/9990-netbase.sh
index b3f886c..496c3ff 100755 (executable)
--- a/components/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