From ae353ec2f6ec5cb357b5ba028d33d8c1242161d0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 21 Jul 2020 11:29:06 +0900 Subject: [PATCH] udev: save ID_RENAMING= property to database before renaming network interface --- src/udev/udev-event.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index b468ce9c03..2ae76eb51a 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -840,11 +840,6 @@ static int rename_netif(UdevEvent *event) { if (r < 0) return log_device_error_errno(dev, r, "Failed to get ifindex: %m"); - r = rtnl_set_link_name(&event->rtnl, ifindex, event->name); - if (r < 0) - return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m", - ifindex, oldname, event->name); - /* Set ID_RENAMING boolean property here, and drop it in the corresponding move uevent later. */ r = device_add_property(dev, "ID_RENAMING", "1"); if (r < 0) @@ -854,6 +849,22 @@ static int rename_netif(UdevEvent *event) { if (r < 0) return log_device_warning_errno(dev, r, "Failed to update properties with new name '%s': %m", event->name); + /* Also set ID_RENAMING boolean property to cloned sd_device object and save it to database + * before calling rtnl_set_link_name(). Otherwise, clients (e.g., systemd-networkd) may receive + * RTM_NEWLINK netlink message before the database is updated. */ + r = device_add_property(event->dev_db_clone, "ID_RENAMING", "1"); + if (r < 0) + return log_device_warning_errno(event->dev_db_clone, r, "Failed to add 'ID_RENAMING' property: %m"); + + r = device_update_db(event->dev_db_clone); + if (r < 0) + return log_device_debug_errno(event->dev_db_clone, r, "Failed to update database under /run/udev/data/: %m"); + + r = rtnl_set_link_name(&event->rtnl, ifindex, event->name); + if (r < 0) + return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m", + ifindex, oldname, event->name); + log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, event->name); return 1;