From 0f4dae57ded4fbd6d72865fc71314b3889431a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= Date: Thu, 26 Feb 2026 12:44:41 +0100 Subject: [PATCH] nmcli: add BRIDGE.PORTS and TEAM.PORTS fields They show the same than BRIDGE/TEAM.SLAVES. We missed this when we did the changes in favour of conscious language. --- src/nmcli/devices.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c index 15c6686f9c..64b4ed366f 100644 --- a/src/nmcli/devices.c +++ b/src/nmcli/devices.c @@ -766,17 +766,19 @@ const NmcMetaGenericInfo *const nmc_fields_dev_wimax_list[] = { const NmcMetaGenericInfo *const nmc_fields_dev_show_controller_prop[] = { NMC_META_GENERIC("NAME"), /* 0 */ NMC_META_GENERIC("SLAVES"), /* 1 */ + NMC_META_GENERIC("PORTS"), /* 2 */ NULL, }; -#define NMC_FIELDS_DEV_SHOW_CONTROLLER_PROP_COMMON "NAME,SLAVES" +#define NMC_FIELDS_DEV_SHOW_CONTROLLER_PROP_COMMON "NAME,SLAVES,PORTS" const NmcMetaGenericInfo *const nmc_fields_dev_show_team_prop[] = { NMC_META_GENERIC("NAME"), /* 0 */ NMC_META_GENERIC("SLAVES"), /* 1 */ - NMC_META_GENERIC("CONFIG"), /* 2 */ + NMC_META_GENERIC("PORTS"), /* 2 */ + NMC_META_GENERIC("CONFIG"), /* 3 */ NULL, }; -#define NMC_FIELDS_DEV_SHOW_TEAM_PROP_COMMON "NAME,SLAVES,CONFIG" +#define NMC_FIELDS_DEV_SHOW_TEAM_PROP_COMMON "NAME,SLAVES,PORTS,CONFIG" const NmcMetaGenericInfo *const nmc_fields_dev_show_vlan_prop[] = { NMC_META_GENERIC("NAME"), /* 0 */ @@ -1537,7 +1539,8 @@ print_bond_bridge_info(NMDevice *device, arr = nmc_dup_fields_array(tmpl, NMC_OF_FLAG_SECTION_PREFIX); set_val_strc(arr, 0, group_prefix); /* i.e. BOND, TEAM, BRIDGE */ - set_val_str(arr, 1, g_string_free(ports_str, FALSE)); + set_val_str(arr, 1, g_strdup(ports_str->str)); + set_val_str(arr, 2, g_string_free(ports_str, FALSE)); g_ptr_array_add(out.output_data, arr); print_data_prepare_width(out.output_data); @@ -1600,8 +1603,9 @@ print_team_info(NMDevice *device, NmCli *nmc, const char *group_prefix, const ch arr = nmc_dup_fields_array(tmpl, NMC_OF_FLAG_SECTION_PREFIX); set_val_strc(arr, 0, group_prefix); /* TEAM */ - set_val_str(arr, 1, g_string_free(ports_str, FALSE)); - set_val_str(arr, 2, sanitize_team_config(nm_device_team_get_config(NM_DEVICE_TEAM(device)))); + set_val_str(arr, 1, g_strdup(ports_str->str)); + set_val_str(arr, 2, g_string_free(ports_str, FALSE)); + set_val_str(arr, 3, sanitize_team_config(nm_device_team_get_config(NM_DEVICE_TEAM(device)))); g_ptr_array_add(out.output_data, arr); print_data_prepare_width(out.output_data);