From d09e53ccb7f3e8cf4ac5755fc3d5d77c121bf6ea Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Wed, 22 Feb 2023 14:34:42 +0100 Subject: [PATCH] libnmc-setting: place replace-local-rule under routing-rules This affects the order in which properties are listed in `nmcli connection show`. The replace-local-rule property should be after the routing-rule property. (cherry picked from commit f46512c54f58d48b25f619b20cf1c4572860702d) --- src/libnmc-setting/nm-meta-setting-desc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libnmc-setting/nm-meta-setting-desc.c b/src/libnmc-setting/nm-meta-setting-desc.c index 5362695c3e..0f67c9bda2 100644 --- a/src/libnmc-setting/nm-meta-setting-desc.c +++ b/src/libnmc-setting/nm-meta-setting-desc.c @@ -6192,6 +6192,9 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = { ), ), ), + PROPERTY_INFO (NM_SETTING_IP_CONFIG_REPLACE_LOCAL_RULE, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_REPLACE_LOCAL_RULE, + .property_type = &_pt_gobject_ternary, + ), PROPERTY_INFO (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, .property_type = &_pt_gobject_bool, ), @@ -6288,9 +6291,6 @@ static const NMMetaPropertyInfo *const property_infos_IP4_CONFIG[] = { PROPERTY_INFO (NM_SETTING_IP_CONFIG_AUTO_ROUTE_EXT_GW, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_AUTO_ROUTE_EXT_GW, .property_type = &_pt_gobject_ternary, ), - PROPERTY_INFO (NM_SETTING_IP_CONFIG_REPLACE_LOCAL_RULE, DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_REPLACE_LOCAL_RULE, - .property_type = &_pt_gobject_ternary, - ), NULL }; @@ -6450,6 +6450,9 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = { ), ), ), + PROPERTY_INFO (NM_SETTING_IP_CONFIG_REPLACE_LOCAL_RULE, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_REPLACE_LOCAL_RULE, + .property_type = &_pt_gobject_ternary, + ), PROPERTY_INFO (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES, .property_type = &_pt_gobject_bool, ), @@ -6542,9 +6545,6 @@ static const NMMetaPropertyInfo *const property_infos_IP6_CONFIG[] = { PROPERTY_INFO_WITH_DESC (NM_SETTING_IP6_CONFIG_TOKEN, .property_type = &_pt_gobject_string, ), - PROPERTY_INFO (NM_SETTING_IP_CONFIG_REPLACE_LOCAL_RULE, DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_REPLACE_LOCAL_RULE, - .property_type = &_pt_gobject_ternary, - ), NULL };