udev/net: do not set unapplied .link file name to ID_NET_LINK_FILE

Instead, import already assigned value from the udev database.
Then, return the builtin earlier.
This commit is contained in:
Yu Watanabe
2024-01-10 04:27:41 +09:00
parent ac36406277
commit 0c3af33e19
2 changed files with 22 additions and 8 deletions
-8
View File
@@ -928,14 +928,6 @@ int link_apply_config(LinkConfigContext *ctx, sd_netlink **rtnl, Link *link) {
assert(rtnl);
assert(link);
if (!IN_SET(link->action, SD_DEVICE_ADD, SD_DEVICE_BIND, SD_DEVICE_MOVE)) {
log_link_debug(link, "Skipping to apply .link settings on '%s' uevent.",
device_action_to_string(link->action));
link->new_name = link->ifname;
return 0;
}
r = link_apply_ethtool_settings(link, &ctx->ethtool_fd);
if (r < 0)
return r;
+22
View File
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "device-private.h"
#include "device-util.h"
#include "escape.h"
#include "errno-util.h"
@@ -21,6 +22,27 @@ static int builtin_net_setup_link(UdevEvent *event, int argc, char **argv, bool
if (argc > 1)
return log_device_error_errno(dev, SYNTHETIC_ERRNO(EINVAL), "This program takes no arguments.");
sd_device_action_t action;
r = sd_device_get_action(dev, &action);
if (r < 0)
return log_device_error_errno(dev, r, "Failed to get action: %m");
if (!IN_SET(action, SD_DEVICE_ADD, SD_DEVICE_BIND, SD_DEVICE_MOVE)) {
log_device_debug(dev, "Skipping to apply .link settings on '%s' uevent.",
device_action_to_string(action));
/* Import previously assigned .link file name. */
(void) udev_builtin_import_property(dev, event->dev_db_clone, test, "ID_NET_LINK_FILE");
(void) udev_builtin_import_property(dev, event->dev_db_clone, test, "ID_NET_LINK_FILE_DROPINS");
/* Set ID_NET_NAME= with the current interface name. */
const char *value;
if (sd_device_get_sysname(dev, &value) >= 0)
(void) udev_builtin_add_property(dev, test, "ID_NET_NAME", value);
return 0;
}
r = link_new(ctx, &event->rtnl, dev, &link);
if (r == -ENODEV) {
log_device_debug_errno(dev, r, "Link vanished while getting information, ignoring.");