diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-04-01 21:21:43 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-04-01 21:33:11 +0200 |
| commit | db07b867a609fcc293b7858a06e2bdd5adaad973 (patch) | |
| tree | 14afd683e3e221b8629cd0c36cfa4af1b46cb59d | |
| parent | 3fe144f9341b714faa8846dd31ed70d63745efc9 (diff) | |
| download | NetworkManager-db07b867a609fcc293b7858a06e2bdd5adaad973.tar.gz | |
cli: restore previous name of IN-USE AP property
Before commit a63c4d082474 ("cli: use designated initializers for
setting NmcOutputField fields") each field had a @name and a
@name_l10n , which were equal for all properties except for wifi
IN-USE:
{"IN-USE", N_("*")}, /* 15 */
The commit removed @name_l10n so now the displayed name is equal to
the field name. But now:
$ nmcli device wifi list
Error: 'device wifi': invalid field 'IN-USE'; allowed fields:
NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,
WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,*,DBUS-PATH
The new field name should be 'IN-USE' and not '*', otherwise scripts
doing "-f IN-USE" will break. As a side effect we now show 'IN-USE'
instead of '*' in the column header, which seems easier to understand:
IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
* default Infra 5 54 Mbit/s 71 ▂▄▆_ WPA2
guest Infra 1 54 Mbit/s 62 ▂▄▆_ WPA2
Fixes: a63c4d08247486148e3e3bd86608a7d0a664f6f1
| -rw-r--r-- | clients/cli/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 69c913a9d5..18ba15d3ba 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -168,7 +168,7 @@ NmcOutputField nmc_fields_dev_wifi_list[] = { OUTPUT_FIELD_WITH_NAME ("RSN-FLAGS"), /* 12 */ OUTPUT_FIELD_WITH_NAME ("DEVICE"), /* 13 */ OUTPUT_FIELD_WITH_NAME ("ACTIVE"), /* 14 */ - OUTPUT_FIELD_WITH_NAME ("*"), /* 15 */ + OUTPUT_FIELD_WITH_NAME ("IN-USE"), /* 15 */ OUTPUT_FIELD_WITH_NAME ("DBUS-PATH"), /* 16 */ { 0 } }; |