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 54fab9a39779e95399c4c3be8f17b60656e9d112..da81ec452723c073b8dfce9f41f23499f628fcb5 100644 (file)
--- 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)