summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-12-07 13:00:01 +0100
committerTom Gundersen <teg@jklm.no>2014-12-08 18:38:55 +0100
commitca6038b89645c0c1bd547d6a420bf95eb3d6f4cc (patch)
tree98f05f25ad3e1f5df4a7f74cf48101089cc20ed7
parent285760fedfaf907deab967b4b071d20e146752b5 (diff)
udev: link-config - simplify net-match
-rw-r--r--src/network/networkd-network.c8
-rw-r--r--src/udev/net/link-config.c21
2 files changed, 12 insertions, 17 deletions
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 75cc7d2f7b..075596af6b 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -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_devtype(device),
ifname)) {
- const char *attr;
- uint8_t name_assign_type = NET_NAME_UNKNOWN;
-
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");
if (attr)
(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",
+ log_warning("%-*s: found matching network '%s', based on potentially unpredictable ifname",
IFNAMSIZ, ifname, network->filename);
else
log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname, network->filename);
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 812325000d..bf24f6a7f7 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -246,7 +246,7 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device,
(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'",
+ log_warning("Config file %s applies to device based on potentially unpredictable interface name '%s'",
link->filename, udev_device_get_sysname(device));
*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) {
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;
+ continue;
}
- } else {
- log_debug("Config file %s applies to device %s",
- link->filename, udev_device_get_sysname(device));
+ }
- *ret = link;
+ log_debug("Config file %s applies to device %s",
+ link->filename, udev_device_get_sysname(device));
- return 0;
- }
+ *ret = link;
+
+ return 0;
}
}