From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 25 Feb 2019 02:54:50 +0000 (+0900)
Subject: udev/net: drop .link files earlier when their conditions do not match system environment
X-Git-Tag: v242-rc1~252^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=176d9c0e11ee9de2ebcfadbaf9c422d3d2e69647;p=thirdparty%2Fsystemd.git

udev/net: drop .link files earlier when their conditions do not match system environment
---

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 7065ec7432e..b25fa1acde4 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -165,6 +165,14 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
         if (link->speed > UINT_MAX)
                 return -ERANGE;
 
+        if (!net_match_config(NULL, NULL, NULL, NULL, NULL,
+                              link->match_host, link->match_virt, link->match_kernel_cmdline,
+                              link->match_kernel_version, link->match_arch,
+                              NULL, NULL, NULL, NULL, NULL)) {
+                log_debug("%s: Conditions do not match the system environment, skipping.", filename);
+                return 0;
+        }
+
         log_debug("Parsed configuration file %s", filename);
 
         LIST_PREPEND(links, ctx->links, link);