]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
When running for a single interface, don't set WAITIP if we are
authorRoy Marples <roy@marples.name>
Wed, 20 Nov 2013 17:36:41 +0000 (17:36 +0000)
committerRoy Marples <roy@marples.name>
Wed, 20 Nov 2013 17:36:41 +0000 (17:36 +0000)
backgrounding immediatley.

dhcpcd.c

index 6ea8f1def65d1772048ead123afff70a596d0043..109c44943ffe7bf11bd58d97a7248e6ffff404a8 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1349,7 +1349,7 @@ main(int argc, char **argv)
 
        /* When running dhcpcd against a single interface, we need to retain
         * the old behaviour of waiting for an IP address */
-       if (ifc == 1)
+       if (ifc == 1 && !(options & DHCPCD_BACKGROUND))
                options |= DHCPCD_WAITIP;
 
        /* RTM_NEWADDR goes through the link socket as well which we