up to 247.6

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

diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index 644626120983e66609e3d13dfabcd1142b9163d7..acab6287f1c5c0fb4ac90bbf29ea5c0082173559 100644 (file)
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -1,56 +1,39 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Thu, 18 Jul 2013 01:04:07 +0200
-Subject: Revert "udev: network device renaming - immediately give up if the
- target name isn't available"
+This is updated patch that fixes interface renaming broken by
+systemd commit 97595710b77aa162ca5e20da57d0a1ed7355eaad.
 
-This reverts commit 97595710b77aa162ca5e20da57d0a1ed7355eaad.
+udev: network device renaming - immediately give up if the target name isn't available
 
-Since we are keeping the old persistent network interface naming for
-now, and make the new naming scheme [1] explictly opt-in [2], re-apply
-this old hack to make the renaming less likely to fail.
+We want to to keep supporting systems with 75-persistent-net-generator.rules
+generated names. Re-apply this old hack to make the renaming less likely to fail.
 
-[1] http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
-[2] d5051f7666e25ecf2b32c7076ce18c1de969d01b
----
- src/udev/udev-event.c | 41 ++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 38 insertions(+), 3 deletions(-)
-
-diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
-index bc115f1..a673f51 100644
---- a/src/udev/udev-event.c
-+++ b/src/udev/udev-event.c
-@@ -769,18 +769,53 @@ static int rename_netif(struct udev_event *event) {
-         char name[IFNAMSIZ];
+--- 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;
-         int r;
+         int ifindex, r;
++        char name[IFNAMSIZ];
 +        int loop;
  
-         oldname = udev_device_get_sysname(dev);
- 
-         strscpy(name, IFNAMSIZ, event->name);
+         if (!event->name)
+                 return 0; /* No new name is requested. */
+@@ -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, udev_device_get_ifindex(dev), name);
-+        if (r >= 0) {
-+                log_debug("renamed network interface %s to %s\n", oldname, name);
-+                goto out;
-+        }
-+
+         r = rtnl_set_link_name(&event->rtnl, ifindex, event->name);
 +        /* 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", udev_device_get_ifindex(dev));
-+        r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name);
-         if (r < 0)
--                return log_error_errno(r, "Error changing net interface name '%s' to '%s': %m", oldname, name);
-+                  goto out;
- 
--        log_debug("renamed network interface '%s' to '%s'", oldname, name);
++        snprintf(name, IFNAMSIZ, "rename%u", ifindex);
++        r = rtnl_set_link_name(&event->rtnl, ifindex, name);
++        if (r < 0)
++                goto out;
++
 +        /* log temporary name */
-+        log_debug("renamed network interface %s to %s\n", oldname, name);
- 
--        return 0;
++        log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, event->name);
++
 +        /* wait a maximum of 90 seconds for our target to become available */
 +        strscpy(name, IFNAMSIZ, event->name);
 +        loop = 90 * 20;
@@ -59,20 +42,11 @@ index bc115f1..a673f51 100644
 +
 +                nanosleep(&duration, NULL);
 +
-+                r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name);
-+                if (r >= 0) {
-+                        log_debug("renamed network interface %s to %s\n", oldname, name);
-+                        break;
-+                }
++                r = rtnl_set_link_name(&event->rtnl, ifindex, name);
 +                if (r != -EEXIST)
-+                        break;
++                        goto out;
 +        }
-+
 +out:
-+        if (r < 0)
-+                log_error("error changing net interface name '%s' to '%s': %s",
-+                          oldname, name, strerror(-r));
-+        return r;
- }
- 
- void udev_event_execute_rules(struct udev_event *event,
+         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);