]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix IPV4LL making the correct environment.
authorRoy Marples <roy@marples.name>
Fri, 12 Jun 2015 20:24:12 +0000 (20:24 +0000)
committerRoy Marples <roy@marples.name>
Fri, 12 Jun 2015 20:24:12 +0000 (20:24 +0000)
script.c

index 1774793e889d37cf3c0f09c35a4f1ca5a7db71dd..d152fb998288a595571c148362c5b62151379b38 100644 (file)
--- 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