From: Roy Marples <roy@marples.name>
Date: Mon, 16 Apr 2007 08:33:22 +0000 (+0000)
Subject: Rename define and add comment to info file
X-Git-Tag: v3.2.3~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5f445cec05fc81e6cf8806bde964a6e9b4e7401;p=thirdparty%2Fdhcpcd.git

Rename define and add comment to info file
---

diff --git a/configure.c b/configure.c
index a24fae79..55415af0 100644
--- a/configure.c
+++ b/configure.c
@@ -465,8 +465,9 @@ static int write_info(const interface_t *iface, const dhcp_t *dhcp,
 		fprintf (f, "CLIENTID='%s'\n", hwaddr_ntoa (iface->hwaddr, iface->hwlen));
 	fprintf (f, "DHCPCHADDR='%s'\n", hwaddr_ntoa (iface->hwaddr, iface->hwlen));
 
-#ifdef INFO_COMPAT
+#ifdef ENABLE_INFO_COMPAT
 	/* Support the old .info settings if we need to */
+	fprintf (f, "\n# dhcpcd-1.x and 2.x compatible variables\n");
 	if (dhcp->dnsservers) {
 		fprintf (f, "DNS='");
 		for (address = dhcp->dnsservers; address; address = address->next) {
@@ -491,7 +492,8 @@ static int write_info(const interface_t *iface, const dhcp_t *dhcp,
 		fprintf (f, "'\n");
 	}
 #endif
-	
+
+	fprintf (f, "\n");	
 	fclose (f);
 	return 0;
 }
diff --git a/configure.h b/configure.h
index 99e62c9d..ac4eb2e3 100644
--- a/configure.h
+++ b/configure.h
@@ -30,7 +30,7 @@
 #define ENABLE_INFO
 
 /* Define this to enable some compatability with 1.x and 2.x info files */
-// #define INFO_COMPAT
+// #define ENABLE_INFO_COMPAT
 
 #include "dhcpcd.h"
 #include "interface.h"