diff options
author | Jiří Klimeš <jklimes@redhat.com> | 2013-12-18 16:10:48 +0100 |
---|---|---|
committer | Jiří Klimeš <jklimes@redhat.com> | 2013-12-18 16:10:48 +0100 |
commit | 80851c3550b97e728d69383c880dd523bec8d6d3 (patch) | |
tree | 1a8c242b65738756843cce0c4b1890b63c106679 /cli | |
parent | 340542a2f2946fa50b02879bc630032ff547b9f6 (diff) | |
download | NetworkManager-80851c3550b97e728d69383c880dd523bec8d6d3.tar.gz |
cli: consider empty value as "*" for "Interface name [*]: " prompt (rh #953397)
And, do it right this time.
https://bugzilla.redhat.com/show_bug.cgi?id=953397
Diffstat (limited to 'cli')
-rw-r--r-- | cli/src/connections.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cli/src/connections.c b/cli/src/connections.c index e357a64ab9..ceb1a7860d 100644 --- a/cli/src/connections.c +++ b/cli/src/connections.c @@ -4577,8 +4577,11 @@ do_connection_add (NmCli *nmc, int argc, char **argv) || strcmp (type, NM_SETTING_VLAN_SETTING_NAME) == 0) ifname_mandatory = FALSE; - if (!ifname && ifname_mandatory && nmc->ask) - ifname = ifname_ask = nmc_get_user_input (_("Interface name: ")); + if (!ifname && ifname_mandatory && nmc->ask) { + ifname = ifname_ask = nmc_get_user_input (_("Interface name [*]: ")); + if (!ifname) + ifname = ifname_ask = g_strdup ("*"); + } if (!ifname && ifname_mandatory) { g_string_printf (nmc->return_text, _("Error: 'ifname' argument is required.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; |