SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions 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/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;
}