colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: only return main setting names as connection types

Browse Source 
Also, return the special slave types.
This commit is contained in:
Beniamino Galvani
2017-04-20 08:48:05 +02:00
parent 243061edb6
commit 032a3b4712
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clients/cli/connections.c
View File

@@ -2855,6 +2855,9 @@ get_valid_options_string_toplevel (void)
for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) {
const NMMetaSettingInfoEditor *setting_info = &nm_meta_setting_infos_editor[i]; const NMMetaSettingInfoEditor *setting_info = &nm_meta_setting_infos_editor[i];
if (!setting_info->valid_parts)
continue;
if (str->len) if (str->len)
g_string_append (str, ", "); g_string_append (str, ", ");
if (setting_info->alias) if (setting_info->alias)
@@ -2862,6 +2865,11 @@ get_valid_options_string_toplevel (void)
else else
g_string_append (str, setting_info->general->setting_name); 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); return g_string_free (str, FALSE);
} }