ui/ncurses: Make server connect message more clear petitboot-1.2.x v1.2.7
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>
Thu, 3 Nov 2016 05:46:20 +0000 (16:46 +1100)
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>
Thu, 24 Nov 2016 02:30:11 +0000 (13:30 +1100)
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)

ui/ncurses/nc-cui.c

index f386c82fab87da24838b203198472886b347b7a1..a4711a943330687c6093dbbc4f3e504a7bf31a02 100644 (file)
@@ -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);
                }
        }