summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichal Suchanek <hramrach@centrum.cz>2011-05-17 19:55:57 +0200
committerDaniel Baumann <daniel@debian.org>2011-05-18 19:30:02 +0200
commit483ffeeb6a25e33037adb7148dbeb15dd6dfdd57 (patch)
tree0a9984875e26d9701ed516f67aeeeb0b52d20995 /scripts
parent822bdbf4f203761cfc76cb720ff55350688c39d4 (diff)
downloadlive-boot-483ffeeb6a25e33037adb7148dbeb15dd6dfdd57.tar.gz
live-boot-483ffeeb6a25e33037adb7148dbeb15dd6dfdd57.zip
Tidy up resolv.conf a bit.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/live b/scripts/live
index 76be7ae..57a4d32 100755
--- a/scripts/live
+++ b/scripts/live
@@ -730,12 +730,15 @@ do_netsetup ()
if [ -n "${DNSDOMAIN}" ]
then
echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
- echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+ echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
fi
for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
do
- echo "nameserver $i" >> /etc/resolv.conf
+ if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
+ then
+ echo "nameserver $i" >> /etc/resolv.conf
+ fi
done
fi