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

cli: enable TAB-completion for "MACVLAN mode: " in nmcli -a con add type macvlan

Browse Source
This commit is contained in:
Jiří Klimeš
2015-12-16 16:09:18 +01:00
parent 835bdaaf1f
commit f8ed5ed239
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
clients/cli/connections.c
View File

@@ -52,6 +52,7 @@
#define PROMPT_CONNECTIONS _("Connection(s) (name, UUID, or path): ") #define PROMPT_CONNECTIONS _("Connection(s) (name, UUID, or path): ")
#define PROMPT_ACTIVE_CONNECTIONS _("Connection(s) (name, UUID, path or apath): ") #define PROMPT_ACTIVE_CONNECTIONS _("Connection(s) (name, UUID, path or apath): ")
#define PROMPT_IP_TUNNEL_MODE _("Tunnel mode: ") #define PROMPT_IP_TUNNEL_MODE _("Tunnel mode: ")
#define PROMPT_MACVLAN_MODE _("MACVLAN mode: ")
static const char *nmc_known_vpns[] = { static const char *nmc_known_vpns[] = {
"openvpn", "openvpn",
@@ -5987,7 +5988,7 @@ cleanup_adsl:
} }
if (!mode && ask) if (!mode && ask)
mode = mode_ask = nmc_readline (_("MACVLAN mode: ")); mode = mode_ask = nmc_readline (PROMPT_MACVLAN_MODE);
if (!mode) { if (!mode) {
g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: 'mode' is required.")); _("Error: 'mode' is required."));
@@ -6790,6 +6791,17 @@ gen_func_ip_tunnel_mode (const char *text, int state)
return nmc_rl_gen_func_basic (text, state, words); return nmc_rl_gen_func_basic (text, state, words);
} }
static char *
gen_func_macvlan_mode (const char *text, int state)
{
gs_free const char **words = NULL;
words = nm_utils_enum_get_values (nm_setting_macvlan_mode_get_type(),
NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
G_MAXINT);
return nmc_rl_gen_func_basic (text, state, words);
}
static char * static char *
gen_func_master_ifnames (const char *text, int state) gen_func_master_ifnames (const char *text, int state)
{ {
@@ -6884,6 +6896,8 @@ nmcli_con_add_tab_completion (const char *text, int start, int end)
generator_func = gen_func_tun_mode; generator_func = gen_func_tun_mode;
else if (g_str_has_suffix (rl_prompt, PROMPT_IP_TUNNEL_MODE)) else if (g_str_has_suffix (rl_prompt, PROMPT_IP_TUNNEL_MODE))
generator_func = gen_func_ip_tunnel_mode; generator_func = gen_func_ip_tunnel_mode;
else if (g_str_has_suffix (rl_prompt, PROMPT_MACVLAN_MODE))
generator_func = gen_func_macvlan_mode;
if (generator_func) if (generator_func)
match_array = rl_completion_matches (text, generator_func); match_array = rl_completion_matches (text, generator_func);