From: Yu Watanabe Date: Wed, 5 Mar 2025 23:22:54 +0000 (+0900) Subject: udev-event: fix filtering logic of renaming network interface X-Git-Tag: v258-rc1~1101^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3157fc91262b6b9ed07556a3da1d40396f53fe9;p=thirdparty%2Fsystemd.git udev-event: fix filtering logic of renaming network interface The device sysname may be different from the network interface name. --- diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 9a50acafe96..d8bdf835b21 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -135,9 +135,9 @@ static int rename_netif(UdevEvent *event) { return 0; } - r = sd_device_get_sysname(dev, &s); + r = device_get_ifname(dev, &s); if (r < 0) - return log_device_warning_errno(dev, r, "Failed to get sysname: %m"); + return log_device_warning_errno(dev, r, "Failed to get ifname: %m"); if (streq(event->name, s)) return 0; /* The interface name is already requested name. */ @@ -242,9 +242,9 @@ static int assign_altnames(UdevEvent *event) { if (r < 0) return log_device_warning_errno(dev, r, "Failed to get ifindex: %m"); - r = sd_device_get_sysname(dev, &s); + r = device_get_ifname(dev, &s); if (r < 0) - return log_device_warning_errno(dev, r, "Failed to get sysname: %m"); + return log_device_warning_errno(dev, r, "Failed to get ifname: %m"); /* Filter out the current interface name. */ strv_remove(event->altnames, s);