SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net_setup/networkd: warn if matching is done on possibly unstable ifname

Browse Source
This commit is contained in:
Tom Gundersen
2014-12-05 16:01:18 +01:00
parent 2a441c8afe
commit 32bc8adcd8
5 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/network-internal.c
+2 -9
View File
@@ -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;
}
src/libsystemd-network/network-internal.h
+1 -2
View File
@@ -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,