From: Roy Marples <roy@marples.name>
Date: Mon, 31 Aug 2020 05:48:59 +0000 (+0100)
Subject: dhcpcd: Adjust prior to ensure options exist for active interfaces before timeouts
X-Git-Tag: v9.2.0~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bc37f87786bd5df38431944dba23d1baf45e33a;p=thirdparty%2Fdhcpcd.git

dhcpcd: Adjust prior to ensure options exist for active interfaces before timeouts
---

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index 00d6a6f9..57bdc105 100644
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -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);