picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16519 from yuwata/networkctl-altnames 

networkctl: tiny cleanups about alternative names
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-07-21 09:10:00 +02:00 committed by GitHub
parent 739b9a4354 48c5398951
commit 2e3e2750bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/networkctl.c
View File

@ -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;