diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2017-04-20 08:48:05 +0200 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-04-20 14:34:20 +0200 |
commit | 032a3b47122fca3e23b2e6b5c0958814c8ca6765 (patch) | |
tree | a555d578b08878de6f1912e1c799d0702f0b1c1c | |
parent | 243061edb6b3e53480bd485432394c5f0e7005c7 (diff) | |
download | NetworkManager-032a3b47122fca3e23b2e6b5c0958814c8ca6765.tar.gz |
cli: only return main setting names as connection types
Also, return the special slave types.
-rw-r--r-- | clients/cli/connections.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 0951b7a26a..535be27424 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -2855,6 +2855,9 @@ get_valid_options_string_toplevel (void) for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { const NMMetaSettingInfoEditor *setting_info = &nm_meta_setting_infos_editor[i]; + if (!setting_info->valid_parts) + continue; + if (str->len) g_string_append (str, ", "); if (setting_info->alias) @@ -2862,6 +2865,11 @@ get_valid_options_string_toplevel (void) else g_string_append (str, setting_info->general->setting_name); } + + if (str->len) + g_string_append (str, ", "); + g_string_append (str, "bond-slave, bridge-slave, team-slave"); + return g_string_free (str, FALSE); } |