From ebfa947e83461ca55d623f2ad8d0835f16ea48f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Thu, 15 Sep 2016 02:49:21 +0200 Subject: [PATCH] cli: enable bash completion for some more properties of add/modify connection.interface-name mavclan.tap mavclan.parent ip-tunnel.parent vxlan.parent (cherry picked from commit c2ef39786702a81713834b31a695ac0a1e9e2a50) --- clients/cli/connections.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 2e81f4afca..69131c1121 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -4383,6 +4383,8 @@ complete_property (const gchar *setting_name, const gchar *property, const gchar run_rl_generator (gen_connection_types, prefix); else if (strcmp (property, NM_SETTING_CONNECTION_MASTER) == 0) run_rl_generator (gen_func_master_ifnames, prefix); + else if (strcmp (property, NM_SETTING_CONNECTION_INTERFACE_NAME) == 0) + run_rl_generator (nmc_rl_gen_func_ifnames, prefix); } else if ( strcmp (setting_name, NM_SETTING_VPN_SETTING_NAME) == 0 && strcmp (property, NM_SETTING_VPN_SERVICE_TYPE) == 0) run_rl_generator (gen_func_vpn_types, prefix); @@ -4403,13 +4405,21 @@ complete_property (const gchar *setting_name, const gchar *property, const gchar } else if ( strcmp (setting_name, NM_SETTING_TUN_SETTING_NAME) == 0 && strcmp (property, NM_SETTING_TUN_MODE) == 0) run_rl_generator (gen_func_tun_mode, prefix); - else if ( strcmp (setting_name, NM_SETTING_IP_TUNNEL_SETTING_NAME) == 0 - && strcmp (property, NM_SETTING_IP_TUNNEL_MODE) == 0) - run_rl_generator (gen_func_ip_tunnel_mode, prefix); - else if ( strcmp (setting_name, NM_SETTING_MACVLAN_SETTING_NAME) == 0 - && strcmp (property, NM_SETTING_MACVLAN_MODE) == 0) - run_rl_generator (gen_func_macvlan_mode, prefix); - + else if (strcmp (setting_name, NM_SETTING_IP_TUNNEL_SETTING_NAME) == 0) { + if (strcmp (property, NM_SETTING_IP_TUNNEL_MODE) == 0) + run_rl_generator (gen_func_ip_tunnel_mode, prefix); + else if (strcmp (property, NM_SETTING_IP_TUNNEL_PARENT) == 0) + run_rl_generator (nmc_rl_gen_func_ifnames, prefix); + } else if (strcmp (setting_name, NM_SETTING_MACVLAN_SETTING_NAME) == 0) { + if (strcmp (property, NM_SETTING_MACVLAN_MODE) == 0) + run_rl_generator (gen_func_macvlan_mode, prefix); + else if (strcmp (property, NM_SETTING_MACVLAN_PARENT) == 0) + run_rl_generator (nmc_rl_gen_func_ifnames, prefix); + else if (strcmp (property, NM_SETTING_MACVLAN_TAP) == 0) + run_rl_generator (gen_func_bool_values_l10n, prefix); + } else if ( strcmp (setting_name, NM_SETTING_VXLAN_SETTING_NAME) == 0 + && strcmp (property, NM_SETTING_VXLAN_PARENT) == 0) + run_rl_generator (nmc_rl_gen_func_ifnames, prefix); } /*----------------------------------------------------------------------------*/