From: Roy Marples <roy@marples.name>
Date: Fri, 12 Jun 2015 20:24:12 +0000 (+0000)
Subject: Fix IPV4LL making the correct environment.
X-Git-Tag: v6.9.1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d546478a0e755c9808e740f5c87b7b22cf8fe2a0;p=thirdparty%2Fdhcpcd.git

Fix IPV4LL making the correct environment.
---

diff --git a/script.c b/script.c
index 1774793e..d152fb99 100644
--- a/script.c
+++ b/script.c
@@ -258,7 +258,7 @@ make_env(const struct interface *ifp, const char *reason, char ***argv)
 			ra = 1;
 #endif
 #ifdef INET
-		else if (strcmp(reason, "IPV4LL") == 0)
+		else if (state->added != STATE_ADDED)
 			ipv4ll = 1;
 		else
 			dhcp = 1;
@@ -280,6 +280,8 @@ make_env(const struct interface *ifp, const char *reason, char ***argv)
 		/* This space left intentionally blank */
 	}
 #ifdef INET
+	else if (strcmp(reason, "IPV4LL") == 0)
+		ipv4ll = 1;
 	else
 		dhcp = 1;
 #endif