From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 17 Jan 2024 01:07:19 +0000 (+0900)
Subject: nspawn-network: also check alternative names
X-Git-Tag: v256-rc1~1103^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=326214bfa8f3efb6886306df3cdcd85a68830448;p=thirdparty%2Fsystemd.git

nspawn-network: also check alternative names

If the requested new name for a network interface is already assigned as a
alternative name, then it is not necessary to and cannot rename the
interface.
---

diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 27ae07eba49..a05a2bc9e0f 100644
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -578,6 +578,37 @@ static int netns_fork_and_wait(int netns_fd, int *ret_original_netns_fd) {
         return 1;
 }
 
+static int needs_rename(sd_netlink **rtnl, sd_device *dev, const char *name) {
+        int r;
+
+        assert(rtnl);
+        assert(dev);
+        assert(name);
+
+        const char *ifname;
+        r = sd_device_get_sysname(dev, &ifname);
+        if (r < 0)
+                return r;
+
+        if (streq(name, ifname))
+                return false;
+
+        int ifindex;
+        r = sd_device_get_ifindex(dev, &ifindex);
+        if (r < 0)
+                return r;
+
+        _cleanup_strv_free_ char **altnames = NULL;
+        r = rtnl_get_link_alternative_names(rtnl, ifindex, &altnames);
+        if (r == -EOPNOTSUPP)
+                return true; /* alternative interface name is not supported, hence the name is not
+                              * assigned to the interface. */
+        if (r < 0)
+                return r;
+
+        return !strv_contains(altnames, name);
+}
+
 static int move_network_interface_one(sd_netlink **rtnl, int netns_fd, sd_device *dev, const char *name) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         int r;
@@ -606,12 +637,10 @@ static int move_network_interface_one(sd_netlink **rtnl, int netns_fd, sd_device
         if (r < 0)
                 return log_device_error_errno(dev, r, "Failed to append namespace fd to netlink message: %m");
 
-        const char *sysname;
-        r = sd_device_get_sysname(dev, &sysname);
+        r = needs_rename(rtnl, dev, name);
         if (r < 0)
-                return log_device_error_errno(dev, r, "Failed to get sysname: %m");
-
-        if (!streq(name, sysname)) {
+                return log_device_error_errno(dev, r, "Failed to determine if the interface should be renamed to '%s': %m", name);
+        if (r > 0) {
                 r = sd_netlink_message_append_string(m, IFLA_IFNAME, name);
                 if (r < 0)
                         return log_device_error_errno(dev, r, "Failed to add netlink interface name: %m");