From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Thu, 3 Nov 2016 05:46:20 +0000 (+1100)
Subject: ui/ncurses: Make server connect message more clear
X-Git-Tag: v1.2.7^0
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=refs%2Fheads%2Fpetitboot-1.2.x

ui/ncurses: Make server connect message more clear

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)
---

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);
 		}
 	}