From: Roy Marples <roy@marples.name>
Date: Fri, 20 Jun 2014 22:32:44 +0000 (+0000)
Subject: Skip arpping directives if we have a profile but not parsing one.
X-Git-Tag: v6.4.1~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba7a34fb3fdc34631f59447683ff8f08897b8fe1;p=thirdparty%2Fdhcpcd.git

Skip arpping directives if we have a profile but not parsing one.
---

diff --git a/if-options.c b/if-options.c
index b5fb8347..7dd2c9b0 100644
--- a/if-options.c
+++ b/if-options.c
@@ -2124,6 +2124,10 @@ read_config(struct dhcpcd_ctx *ctx,
 				skip = 1;
 			continue;
 		}
+		/* Skip arping if we have selected a profile but not parsing
+		 * one. */
+		if (profile && !have_profile && strcmp(option, "arping") == 0)
+			continue;
 		if (skip)
 			continue;
 		parse_config_line(ctx, ifname, ifo, option, line, &ldop, &edop);