diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2016-11-03 16:46:20 +1100 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2016-11-24 13:30:11 +1100 |
| commit | f5c10524f88751be5ec2766185875b4359fcbb70 (patch) | |
| tree | d08568fd01b0cc96b7549fe99ca31ef7aa03b702 | |
| parent | 69078e89091998d40ffac03b0d57511d3531b2f2 (diff) | |
| download | petitboot-f5c10524f88751be5ec2766185875b4359fcbb70.zip petitboot-f5c10524f88751be5ec2766185875b4359fcbb70.tar.gz | |
ui/ncurses: Make server connect message more clearv1.2.7petitboot-1.2.x
The current message mentions a "server" which can give the misleading
impression that the UI is waiting for a remote network server. The delay
is actually in waiting for the pb-discover process to be ready, so
update the message to reflect that.
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
(cherry picked from commit ea8bd5f424a9b01c71e1694bb5b6ffc13e3da4f5)
| -rw-r--r-- | ui/ncurses/nc-cui.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index f386c82..a4711a9 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -959,13 +959,15 @@ static int cui_server_wait(void *arg) if (!cui->client) { waiter_register_timeout(cui->waitset, 1000, cui_server_wait, cui); - nc_scr_status_printf(cui->current, "Info: Waiting for server"); + nc_scr_status_printf(cui->current, + "Info: Waiting for device discovery"); } else { - nc_scr_status_printf(cui->current, "Info: Connected to server!"); + nc_scr_status_printf(cui->current, + "Info: Connected to pb-discover!"); talloc_steal(cui, cui->client); if (cui->has_input) { - pb_log("Aborting default boot on server connect\n"); + pb_log("Aborting default boot on pb-discover connect\n"); discover_client_cancel_default(cui->client); } } |
