diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-06-24 22:18:05 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-06-24 22:18:05 +0200 |
| commit | e93960ad6eb6745e5f885b06912a7d3252eb305a (patch) | |
| tree | 86856f0e0be8f9e2159437d8e872ee8f6679dfba /components | |
| parent | 3da00deab98dc5999f4583d05d164e2549efa6b2 (diff) | |
| download | live-boot-e93960ad6eb6745e5f885b06912a7d3252eb305a.tar.gz live-boot-e93960ad6eb6745e5f885b06912a7d3252eb305a.zip | |
Simplifying /etc/resolv.conf generation a bit.
Diffstat (limited to 'components')
| -rwxr-xr-x | components/9990-netbase.sh | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/components/9990-netbase.sh b/components/9990-netbase.sh index b3f886c..496c3ff 100755 --- 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 |