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:
2aa7d2a
)
Update DNSFILE even if DNSFILE contains only commented or empty lines
author
raizo62
<silicium62-debian@yahoo.com>
Tue, 6 Mar 2018 19:20:29 +0000
(20:20 +0100)
committer
raizo62
<dansart@utec-tic.org>
Wed, 7 Mar 2018 18:05:09 +0000
(19:05 +0100)
components/9990-main.sh
patch
|
blob
|
history
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
- 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}