]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
dhcpcd: Adjust prior to ensure options exist for active interfaces before timeouts
authorRoy Marples <roy@marples.name>
Mon, 31 Aug 2020 05:48:59 +0000 (06:48 +0100)
committerRoy Marples <roy@marples.name>
Mon, 31 Aug 2020 05:48:59 +0000 (06:48 +0100)
src/dhcpcd.c

index 00d6a6f90e744f1a564fb3908369b4bf2a1c6d5c..57bdc10510c6a153441b326984c3390ff560a35e 100644 (file)
@@ -1158,7 +1158,6 @@ dhcpcd_initprestartinterface(void *arg)
 {
        struct interface *ifp = arg;
 
-       dhcpcd_initstate(ifp, 0);
        run_preinit(ifp);
        dhcpcd_prestartinterface(ifp);
 }
@@ -1225,9 +1224,11 @@ dhcpcd_linkoverflow(struct dhcpcd_ctx *ctx)
                        continue;
                }
                TAILQ_INSERT_TAIL(ctx->ifaces, ifp, next);
-               if (ifp->active)
+               if (ifp->active) {
+                       dhcpcd_initstate(ifp, 0);
                        eloop_timeout_add_sec(ctx->eloop, 0,
                            dhcpcd_initprestartinterface, ifp);
+               }
        }
        free(ifaces);