up to 254.6

[packages/systemd.git] / net-rename-revert.patch

diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index acab6287f1c5c0fb4ac90bbf29ea5c0082173559..8de05a671320c8537b929747284adda049d6895a 100644 (file)
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -9,30 +9,30 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
 --- systemd-stable-246.1/src/udev/udev-event.c.orig    2020-08-07 17:09:53.000000000 +0200
 +++ systemd-stable-246.1/src/udev/udev-event.c 2020-08-15 11:04:10.263428290 +0200
 @@ -820,6 +820,8 @@
-         sd_device *dev = event->dev;
-         const char *oldname;
+         const char *s;
+         sd_device *dev;
          int ifindex, r;
 +        char name[IFNAMSIZ];
 +        int loop;
  
-         if (!event->name)
-                 return 0; /* No new name is requested. */
+         assert(event);
+ 
 @@ -861,6 +863,32 @@
-                 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);
+         r = rtnl_set_link_name(&event->rtnl, ifindex, event->name, event->altnames);
 +        /* keep trying if the destination interface name already exists */
 +        if (r != -EEXIST)
 +                goto out;
 +
 +        /* free our own name, another process may wait for us */
-+        snprintf(name, IFNAMSIZ, "rename%u", ifindex);
-+        r = rtnl_set_link_name(&event->rtnl, ifindex, name);
++        snprintf(name, IFNAMSIZ, "rename%d", ifindex);
++        r = rtnl_set_link_name(&event->rtnl, ifindex, name, NULL);
 +        if (r < 0)
 +                goto out;
 +
 +        /* log temporary name */
-+        log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, event->name);
++        log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, old_sysname, event->name);
 +
 +        /* wait a maximum of 90 seconds for our target to become available */
 +        strscpy(name, IFNAMSIZ, event->name);
@@ -42,11 +42,11 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
 +
 +                nanosleep(&duration, NULL);
 +
-+                r = rtnl_set_link_name(&event->rtnl, ifindex, name);
++                r = rtnl_set_link_name(&event->rtnl, ifindex, name, NULL);
 +                if (r != -EEXIST)
 +                        goto out;
 +        }
 +out:
-         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);
+         if (r < 0) {
+                 if (r == -EBUSY) {
+                         log_device_info(event->dev_db_clone,