From: Roy Marples <roy@marples.name>
Date: Tue, 12 Aug 2008 20:44:42 +0000 (+0000)
Subject: Don't assume comments start with #
X-Git-Tag: v4.0.2~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43aedb8a161bdafb30c64ac89a53159dc6f37cdd;p=thirdparty%2Fdhcpcd.git

Don't assume comments start with #
---

diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf
index 437c1167..2cd2939c 100644
--- a/dhcpcd-hooks/20-resolv.conf
+++ b/dhcpcd-hooks/20-resolv.conf
@@ -8,7 +8,7 @@ make_resolv_conf()
 		-z "${new_domain_search}" ]; then
 		return 0
 	fi
-	local x= conf="${signature}\n"
+	local x= conf="# ${signature}\n"
 	if [ -n "${new_domain_search}" ]; then
 		conf="${conf}search ${new_domain_search}\n"
 	elif [ -n "${new_domain_name}" ]; then
diff --git a/dhcpcd-hooks/50-ntp.conf b/dhcpcd-hooks/50-ntp.conf
index 81faf22e..2b3e40e4 100644
--- a/dhcpcd-hooks/50-ntp.conf
+++ b/dhcpcd-hooks/50-ntp.conf
@@ -14,7 +14,7 @@ make_ntp_conf()
 {
 	[ -z "${new_ntp_servers}" ] && return 0
 	local cf=/etc/ntp.conf."${interface}" x=
-	echo "${signature}" > "${cf}"
+	echo "# ${signature}" > "${cf}"
 	echo "restrict default noquery notrust nomodify" >> "${cf}"
 	echo "restrict 127.0.0.1" >> "${cf}"
 	for x in ${new_ntp_servers}; do
diff --git a/dhcpcd-hooks/50-yp.conf b/dhcpcd-hooks/50-yp.conf
index 603f267b..25b40170 100644
--- a/dhcpcd-hooks/50-yp.conf
+++ b/dhcpcd-hooks/50-yp.conf
@@ -10,7 +10,7 @@ make_yp_conf()
 {
 	[ -z "${new_nis_domain}" -a -z "${new_nis_servers}" ] && return 0
 	local cf=/etc/yp.conf."${interface}" prefix= x= pid=
-	echo "${signature}" > "${cf}"
+	echo "# ${signature}" > "${cf}"
 	if [ -n "${new_nis_domain}" ]; then
 		domainname "${new_nis_domain}"
 		if [ -n "${new_nis_servers}" ]; then
diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
index a995da31..a4a55e27 100644
--- a/dhcpcd-run-hooks.in
+++ b/dhcpcd-run-hooks.in
@@ -2,7 +2,7 @@
 # dhcpcd client configuration script 
 
 # Handy functions for our hooks to use
-signature="# Generated by dhcpcd for ${interface}"
+signature="Generated by dhcpcd for ${interface}"
 save_conf()
 {
 	if [ -f "$1" ]; then