summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-12-05 15:56:10 +0100
committerTom Gundersen <teg@jklm.no>2014-12-05 16:01:18 +0100
commit32bc8adcd836baff68e4d0f53b9a382f358cccf8 (patch)
treeb5db45cc55b761fbfa7921b8b97f21495703633b /src/network
parent2a441c8afe7c81f74cc2ceccdf9a71301cd39d4d (diff)
net_setup/networkd: warn if matching is done on possibly unstable ifname
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkd-netdev.c2
-rw-r--r--src/network/networkd-network.c19
2 files changed, 17 insertions, 4 deletions
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index a277576a7a..b75eab9cd8 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -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)) {
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index b014a6b649..bbc6475df0 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -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;
}