up to 254 (last major release to support split-usr and unmerged-usr)

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

diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index f2cd69ac39cf1dcc1ae987eb1b535530cd938f59..f993272c0dbd7630c300371bb951e2974597bdf8 100644 (file)
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -20,14 +20,14 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
 @@ -861,6 +863,32 @@
          }
  
-         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%d", ifindex);
-+        r = rtnl_set_link_name(&event->rtnl, ifindex, name);
++        r = rtnl_set_link_name(&event->rtnl, ifindex, name, NULL);
 +        if (r < 0)
 +                goto out;
 +
@@ -42,7 +42,7 @@ 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;
 +        }