summaryrefslogtreecommitdiff
path: root/src/libsystemd-network
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-12-05 15:56:10 +0100
committerTom Gundersen <teg@jklm.no>2014-12-05 16:01:18 +0100
commit32bc8adcd836baff68e4d0f53b9a382f358cccf8 (patch)
treeb5db45cc55b761fbfa7921b8b97f21495703633b /src/libsystemd-network
parent2a441c8afe7c81f74cc2ceccdf9a71301cd39d4d (diff)
net_setup/networkd: warn if matching is done on possibly unstable ifname
Diffstat (limited to 'src/libsystemd-network')
-rw-r--r--src/libsystemd-network/network-internal.c11
-rw-r--r--src/libsystemd-network/network-internal.h3
2 files changed, 3 insertions, 11 deletions
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index b90fd1ccc8..90f830a351 100644
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -96,8 +96,7 @@ bool net_match_config(const struct ether_addr *match_mac,
const char *dev_parent_driver,
const char *dev_driver,
const char *dev_type,
- const char *dev_name,
- bool ignore_name_match) {
+ const char *dev_name) {
if (match_host && !condition_test(match_host))
return false;
@@ -127,14 +126,8 @@ bool net_match_config(const struct ether_addr *match_mac,
if (match_type && !streq_ptr(match_type, dev_type))
return false;
- if (match_name) {
- if (!dev_name || fnmatch(match_name, dev_name, 0))
+ if (match_name && (!dev_name || fnmatch(match_name, dev_name, 0)))
return false;
- else if (ignore_name_match) {
- log_warning("ifname (%s) matched config, but is ignored as it is not the original name", dev_name);
- return false;
- }
- }
return true;
}
diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
index 981c4e0e21..c64db2e79d 100644
--- a/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@ -42,8 +42,7 @@ bool net_match_config(const struct ether_addr *match_mac,
const char *dev_parent_driver,
const char *dev_driver,
const char *dev_type,
- const char *dev_name,
- bool ignore_name_match);
+ const char *dev_name);
int config_parse_net_condition(const char *unit, const char *filename, unsigned line,
const char *section, unsigned section_line, const char *lvalue,