mirror of
https://github.com/systemd/systemd.git
synced 2025-03-21 02:50:18 +03:00
udev-event: fix filtering logic of renaming network interface
The device sysname may be different from the network interface name.
This commit is contained in:
parent
4352457a96
commit
b3157fc912
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user