shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-08-05 16:22:27 +03:00
Code Activity

udev: link-config - simplify net-match

Browse Source
This commit is contained in:
Tom Gundersen
2014-12-07 13:00:01 +01:00
parent 285760fedf
commit ca6038b896
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/networkd-network.c
View File

@ -226,16 +226,16 @@ int network_get(Manager *manager, struct udev_device *device,
udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_property_value(device, "ID_NET_DRIVER"),
udev_device_get_devtype(device), udev_device_get_devtype(device),
ifname)) { ifname)) {
const char *attr;
uint8_t name_assign_type = NET_NAME_UNKNOWN;
if (network->match_name) { if (network->match_name) {
const char *attr;
uint8_t name_assign_type = NET_NAME_UNKNOWN;
attr = udev_device_get_sysattr_value(device, "name_assign_type"); attr = udev_device_get_sysattr_value(device, "name_assign_type");
if (attr) if (attr)
(void)safe_atou8(attr, &name_assign_type); (void)safe_atou8(attr, &name_assign_type);
if (name_assign_type == NET_NAME_ENUM) if (name_assign_type == NET_NAME_ENUM)
log_warning("%-*s: found matching network '%s', based on potentially unstable ifname", log_warning("%-*s: found matching network '%s', based on potentially unpredictable ifname",
IFNAMSIZ, ifname, network->filename); IFNAMSIZ, ifname, network->filename);
else else
log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname, network->filename); log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname, network->filename);

23
src/udev/net/link-config.c
View File

@ -246,7 +246,7 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device,
(void)safe_atou8(attr_value, &name_assign_type); (void)safe_atou8(attr_value, &name_assign_type);
if (name_assign_type == NET_NAME_ENUM) { if (name_assign_type == NET_NAME_ENUM) {
log_warning("Config file %s applies to device based on potentially unstable interface name '%s'", log_warning("Config file %s applies to device based on potentially unpredictable interface name '%s'",
link->filename, udev_device_get_sysname(device)); link->filename, udev_device_get_sysname(device));
*ret = link; *ret = link;
@ -254,22 +254,17 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device,
} else if (name_assign_type == NET_NAME_RENAMED) { } else if (name_assign_type == NET_NAME_RENAMED) {
log_warning("Config file %s matches device based on renamed interface name '%s', ignoring", log_warning("Config file %s matches device based on renamed interface name '%s', ignoring",
link->filename, udev_device_get_sysname(device)); 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; continue;
return 0;
} }
} else {
log_debug("Config file %s applies to device %s",
link->filename, udev_device_get_sysname(device));
*ret = link;
return 0;
} }
log_debug("Config file %s applies to device %s",
link->filename, udev_device_get_sysname(device));
*ret = link;
return 0;
} }
} }