From: Roy Marples <roy@marples.name>
Date: Sun, 25 Oct 2009 10:56:54 +0000 (+0000)
Subject: We need to enable waitip when running on a single interface to retain
X-Git-Tag: v5.1.3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f389f528230a24d1356b7c86ec1f15c327f0a13;p=thirdparty%2Fdhcpcd.git

We need to enable waitip when running on a single interface to retain
compat with older dhcpcd versions.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 7dec827a..6988be17 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1770,6 +1770,11 @@ main(int argc, char **argv)
 	ifc = argc - optind;
 	ifv = argv + optind;
 
+	/* When running dhcpcd against a single interface, we need to retain
+	 * the old behaviour of waiting for an IP address */
+	if (ifc == 1)
+		options |= DHCPCD_WAITIP;
+
 	ifaces = discover_interfaces(ifc, ifv);
 	for (i = 0; i < ifc; i++) {
 		for (iface = ifaces; iface; iface = iface->next)