chiark / gitweb /
udev: link-config - simplify net-match
authorTom Gundersen <teg@jklm.no>
Sun, 7 Dec 2014 12:00:01 +0000 (13:00 +0100)
committerTom Gundersen <teg@jklm.no>
Mon, 8 Dec 2014 17:38:55 +0000 (18:38 +0100)
src/network/networkd-network.c
src/udev/net/link-config.c

index 75cc7d2..075596a 100644 (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_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);
index 8123250..bf24f6a 100644 (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);
 
                                 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;
                 }
         }