From 486161cff425b98e9256ea9ff5410689397fd94e Mon Sep 17 00:00:00 2001 From: Antonio Cardace Date: Wed, 15 Apr 2020 10:13:19 +0200 Subject: [PATCH] bridge: make some advanced options hidden if default The options are: * group-address * multicast-querier * multicast-query-use-ifaddr * multicast-router * vlan-stats-enabled * vlan-protocol (cherry picked from commit 3af07fd4157c02690b96d99fa8d2b27392e27b2e) --- clients/common/nm-meta-setting-desc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index efad09ec57..c2f6b71769 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -4892,6 +4892,7 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = { ), PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_GROUP_ADDRESS, .property_type = &_pt_gobject_mac, + .hide_if_default = TRUE, ), PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_GROUP_FORWARD_MASK, .is_cli_option = TRUE, @@ -4901,9 +4902,11 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = { ), PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERIER, .property_type = &_pt_gobject_bool, + .hide_if_default = TRUE, ), PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR, .property_type = &_pt_gobject_bool, + .hide_if_default = TRUE, ), PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_SNOOPING, .is_cli_option = TRUE, @@ -4913,6 +4916,7 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = { ), PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_MULTICAST_ROUTER, .property_type = &_pt_gobject_string, + .hide_if_default = TRUE, .property_typ_data = DEFINE_PROPERTY_TYP_DATA ( .values_static = NM_MAKE_STRV ("auto", "disabled", @@ -4927,9 +4931,11 @@ static const NMMetaPropertyInfo *const property_infos_BRIDGE[] = { ), PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_VLAN_STATS_ENABLED, .property_type = &_pt_gobject_bool, + .hide_if_default = TRUE, ), PROPERTY_INFO_WITH_DESC (NM_SETTING_BRIDGE_VLAN_PROTOCOL, .property_type = &_pt_gobject_string, + .hide_if_default = TRUE, .property_typ_data = DEFINE_PROPERTY_TYP_DATA ( .values_static = NM_MAKE_STRV ("802.1Q", "802.1ad"),