clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-16 21:30:52 +00:00
Code Issues 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,
src/network/networkd-netdev.c
+1 -1
View File
@@ -654,7 +654,7 @@ static int netdev_load_one(Manager *manager, const char *filename) {
if (net_match_config(NULL, NULL, NULL, NULL, NULL,
netdev_raw->match_host, netdev_raw->match_virt,
netdev_raw->match_kernel, netdev_raw->match_arch,
NULL, NULL, NULL, NULL, NULL, NULL, false) <= 0)
NULL, NULL, NULL, NULL, NULL, NULL) <= 0)
return 0;
if (!NETDEV_VTABLE(netdev_raw)) {
src/network/networkd-network.c
+16 -3
View File
@@ -225,9 +225,22 @@ int network_get(Manager *manager, struct udev_device *device,
udev_device_get_driver(udev_device_get_parent(device)),
udev_device_get_property_value(device, "ID_NET_DRIVER"),
udev_device_get_devtype(device),
ifname, false)) {
log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname,
network->filename);
ifname)) {
const char *attr;
uint8_t name_assign_type = NET_NAME_UNKNOWN;
if (network->match_name) {
attr = udev_device_get_sysattr_value(device, "name_assign_type");
(void)safe_atou8(attr, &name_assign_type);
if (name_assign_type == NET_NAME_ENUM)
log_warning("%-*s: found matching network '%s', based on potentially unstable ifname",
IFNAMSIZ, ifname, network->filename);
else
log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname, network->filename);
} else
log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname, network->filename);
*ret = network;
return 0;
}
src/udev/net/link-config.c
+33 -12
View File
@@ -226,11 +226,6 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device,
LIST_FOREACH(links, link, ctx->links) {
const char* attr_value;
unsigned char name_assign_type = NET_NAME_UNKNOWN;
attr_value = udev_device_get_sysattr_value(device, "name_assign_type");
if (attr_value)
(void)safe_atou8(attr_value, &name_assign_type);
attr_value = udev_device_get_sysattr_value(device, "address");
@@ -242,13 +237,39 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device,
udev_device_get_driver(udev_device_get_parent(device)),
udev_device_get_property_value(device, "ID_NET_DRIVER"),
udev_device_get_devtype(device),
udev_device_get_sysname(device),
name_assign_type == NET_NAME_RENAMED)) {
log_debug("Config file %s applies to device %s",
link->filename,
udev_device_get_sysname(device));
*ret = link;
return 0;
udev_device_get_sysname(device))) {
if (link->match_name) {
unsigned char name_assign_type = NET_NAME_UNKNOWN;
attr_value = udev_device_get_sysattr_value(device, "name_assign_type");
if (attr_value)
(void)safe_atou8(attr_value, &name_assign_type);
if (name_assign_type == NET_NAME_ENUM) {
log_warning("Config file %s applies to device based on potentially unstable interface name '%s'",
link->filename, udev_device_get_sysname(device));
*ret = link;
return 0;
} else if (name_assign_type == NET_NAME_RENAMED) {
log_warning("Config file %s matches device based on renamed interface name '%s', ignoring",
link->filename, udev_device_get_sysname(device));
} else {
log_debug("Config file %s applies to device %s",
link->filename, udev_device_get_sysname(device));
*ret = link;
return 0;
}
} else {
log_debug("Config file %s applies to device %s",
link->filename, udev_device_get_sysname(device));
*ret = link;
return 0;
}
}
}