1 From: Michael Biebl <biebl@debian.org>
2 Date: Thu, 18 Jul 2013 01:04:07 +0200
3 Subject: Revert "udev: network device renaming - immediately give up if the
4 target name isn't available"
6 This reverts commit 97595710b77aa162ca5e20da57d0a1ed7355eaad.
8 We need to keep supporting systems with 75-persistent-net-generator.rules
9 generated names for a while after switching to net.ifnames. Re-apply this old
10 hack to make the renaming less likely to fail.
12 src/udev/udev-event.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
13 1 file changed, 46 insertions(+), 5 deletions(-)
15 diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
16 index 07b7365..f67b295 100644
17 --- a/src/udev/udev-event.c
18 +++ b/src/udev/udev-event.c
19 @@ -680,6 +680,7 @@ static int rename_netif(UdevEvent *event) {
20 const char *action, *oldname;
26 return 0; /* No new name is requested. */
27 @@ -705,17 +706,57 @@ static int rename_netif(UdevEvent *event) {
28 return log_device_error_errno(dev, r, "Failed to get ifindex: %m");
30 strscpy(name, IFNAMSIZ, event->name);
32 r = rtnl_set_link_name(&event->rtnl, ifindex, name);
34 - return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m", ifindex, oldname, name);
36 + r = device_rename(dev, event->name);
38 + return log_warning_errno(r, "Network interface %i is renamed from '%s' to '%s', but could not update sd_device object: %m", ifindex, oldname, name);
40 + log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, name);
45 + /* keep trying if the destination interface name already exists */
49 - r = device_rename(dev, event->name);
50 + /* free our own name, another process may wait for us */
51 + snprintf(name, IFNAMSIZ, "rename%u", ifindex);
52 + r = rtnl_set_link_name(&event->rtnl, ifindex, name);
54 - return log_warning_errno(r, "Network interface %i is renamed from '%s' to '%s', but could not update sd_device object: %m", ifindex, oldname, name);
57 + /* log temporary name */
58 log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, name);
61 + /* wait a maximum of 90 seconds for our target to become available */
62 + strscpy(name, IFNAMSIZ, event->name);
65 + const struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
67 + nanosleep(&duration, NULL);
69 + r = rtnl_set_link_name(&event->rtnl, ifindex, name);
71 + r = device_rename(dev, event->name);
73 + return log_warning_errno(r, "Network interface %i is renamed from '%s' to '%s', but could not update sd_device object: %m", ifindex, oldname, name);
75 + log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, name);
85 + return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m", ifindex, oldname, name);
89 static int update_devnode(UdevEvent *event) {