From: raizo62 <silicium62-debian@yahoo.com>
Date: Tue, 6 Mar 2018 19:20:29 +0000 (+0100)
Subject: Update DNSFILE even if DNSFILE contains only commented or empty lines
X-Git-Tag: debian/1%20180328~19
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=a28b96c521b85100e32093b9e65476947a780db3

Update DNSFILE even if DNSFILE contains only commented or empty lines
---

diff --git a/components/9990-main.sh b/components/9990-main.sh
index 20e8c0c..bab0bd7 100755
--- 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}