summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2013-08-27 10:14:46 +0200
committerJiří Klimeš <jklimes@redhat.com>2013-08-27 10:20:41 +0200
commit3cb0bf6bc06293a224bfda4967457af69be89bfc (patch)
treef40f7164ea1412eb5c7970705fecc30cc7818a38
parentc822b12cf17253cd59efdda0a21cd2f802c16a06 (diff)
downloadNetworkManager-3cb0bf6bc06293a224bfda4967457af69be89bfc.tar.gz
cli: consider empty value as "*" for "Interface name: " prompt
-rw-r--r--cli/src/connections.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/cli/src/connections.c b/cli/src/connections.c
index d67bcd7042..5e34bd0e67 100644
--- a/cli/src/connections.c
+++ b/cli/src/connections.c
@@ -3284,12 +3284,10 @@ do_connection_add (NmCli *nmc, int argc, char **argv)
ifname_mandatory = FALSE;
if (!ifname && ifname_mandatory && nmc->ask)
- ifname = ifname_ask = nmc_get_user_input (_("Interface name: "));
- if (!ifname && ifname_mandatory) {
- g_string_printf (nmc->return_text, _("Error: 'ifname' argument is required."));
- nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
- goto error;
- }
+ ifname = ifname_ask = nmc_get_user_input (_("Interface name [*]: "));
+ if (!ifname && ifname_mandatory)
+ ifname = ifname_ask = g_strdup ("*");
+
if (ifname) {
if (!nm_utils_iface_valid_name (ifname) && strcmp (ifname, "*") != 0) {
g_string_printf (nmc->return_text,