Merge pull request #16519 from yuwata/networkctl-altnames

networkctl: tiny cleanups about alternative names
2020-07-21 09:10:00 +02:00
parent 739b9a4354 48c5398951
commit 2e3e2750bb
1 changed files with 2 additions and 1 deletions
@@ -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;