Merge pull request #16519 from yuwata/networkctl-altnames

networkctl: tiny cleanups about alternative names

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index a80a6185dabb1c96eebe332d9c16f9143ff7d46c..48182e61ddfe803003b1601ec0f8d9c6be991867 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -380,7 +380,7 @@ static int decode_link(sd_netlink_message *m, LinkInfo *info, char **patterns, b
                 return r;
 
         r = sd_netlink_message_read_strv(m, IFLA_PROP_LIST, IFLA_ALT_IFNAME, &altnames);
-        if (r < 0 && !IN_SET(r, -EOPNOTSUPP, -ENODATA))
+        if (r < 0 && r != -ENODATA)
                 return r;
 
         if (patterns) {
@@ -1486,6 +1486,7 @@ static int link_status_one(
         if (r < 0)
                 return table_log_add_error(r);
 
+        strv_sort(info->alternative_names);
         r = dump_list(table, "Alternative Names:", info->alternative_names);
         if (r < 0)
                 return r;