projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
822bdbf
)
Tidy up resolv.conf a bit.
author
Michal Suchanek
<hramrach@centrum.cz>
Tue, 17 May 2011 17:55:57 +0000
(19:55 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 18 May 2011 17:30:02 +0000
(19:30 +0200)
scripts/live
patch
|
blob
|
history
diff --git
a/scripts/live
b/scripts/live
index
76be7ae
..
57a4d32
100755
(executable)
--- 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