From: Roy Marples <roy@marples.name>
Date: Thu, 12 Sep 2013 21:35:33 +0000 (+0000)
Subject: Start dev after link for a more sane interface rename.
X-Git-Tag: v6.1.0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81ff1cbf91aed72be6eb8371b81e4e39d0c8be4b;p=thirdparty%2Fdhcpcd.git

Start dev after link for a more sane interface rename.
Only start dev in master mode.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 54fab9a3..da81ec45 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1212,11 +1212,6 @@ main(int argc, char **argv)
 	if (ifc == 1)
 		options |= DHCPCD_WAITIP;
 
-	/* Start any dev listening plugin which may want to
-	 * change the interface name provided by the kernel */
-	if (options & DHCPCD_DEV)
-		dev_start(dev_load);
-
 	/* RTM_NEWADDR goes through the link socket as well which we
 	 * need for IPv6 DAD, so we check for DHCPCD_LINK in handle_carrier
 	 * instead.
@@ -1230,6 +1225,12 @@ main(int argc, char **argv)
 			eloop_event_add(linkfd, handle_link, NULL);
 	}
 
+	/* Start any dev listening plugin which may want to
+	 * change the interface name provided by the kernel */
+	if ((options & (DHCPCD_MASTER | DHCPCD_DEV)) ==
+	    (DHCPCD_MASTER | DHCPCD_DEV))
+		dev_start(dev_load);
+
 	ifaces = discover_interfaces(ifc, ifv);
 	for (i = 0; i < ifc; i++) {
 		if (find_interface(ifv[i]) == NULL)