projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update DNSFILE even if DNSFILE contains only commented or empty lines
[live-boot-grml.git]
/
components
/
9990-main.sh
diff --git
a/components/9990-main.sh
b/components/9990-main.sh
index
20e8c0c
..
bab0bd7
100755
(executable)
--- a/
components/9990-main.sh
+++ b/
components/9990-main.sh
@@
-162,7
+162,7
@@
Live ()
else
DNSFILE="${rootmnt}/etc/resolv.conf"
fi
else
DNSFILE="${rootmnt}/etc/resolv.conf"
fi
- if [ -f /etc/resolv.conf ] &&
[ ! -s ${DNSFILE} ]
+ if [ -f /etc/resolv.conf ] &&
! grep -E -q -v '^[[:space:]]*#|^[[:space:]]*$' ${DNSFILE}
then
log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
cp -v /etc/resolv.conf ${DNSFILE}
then
log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
cp -v /etc/resolv.conf ${DNSFILE}