1 This is updated patch that fixes interface renaming broken by
2 systemd commit 97595710b77aa162ca5e20da57d0a1ed7355eaad.
4 udev: network device renaming - immediately give up if the target name isn't available
6 We want to to keep supporting systems with 75-persistent-net-generator.rules
7 generated names. Re-apply this old hack to make the renaming less likely to fail.
9 --- systemd-stable-246.1/src/udev/udev-event.c.orig 2020-08-07 17:09:53.000000000 +0200
10 +++ systemd-stable-246.1/src/udev/udev-event.c 2020-08-15 11:04:10.263428290 +0200
12 sd_device *dev = event->dev;
15 + char name[IFNAMSIZ];
19 return 0; /* No new name is requested. */
21 return log_device_debug_errno(event->dev_db_clone, r, "Failed to update database under /run/udev/data/: %m");
23 r = rtnl_set_link_name(&event->rtnl, ifindex, event->name);
24 + /* keep trying if the destination interface name already exists */
28 + /* free our own name, another process may wait for us */
29 + snprintf(name, IFNAMSIZ, "rename%u", ifindex);
30 + r = rtnl_set_link_name(&event->rtnl, ifindex, name);
34 + /* log temporary name */
35 + log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, event->name);
37 + /* wait a maximum of 90 seconds for our target to become available */
38 + strscpy(name, IFNAMSIZ, event->name);
41 + const struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
43 + nanosleep(&duration, NULL);
45 + r = rtnl_set_link_name(&event->rtnl, ifindex, name);
51 return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m",
52 ifindex, oldname, event->name);