ui/ncurses: Make server connect message more clear
diff mbox

Message ID 20161107235127.16792-1-sam@mendozajonas.com
State Accepted
Headers show

Commit Message

Samuel Mendoza-Jonas Nov. 7, 2016, 11:51 p.m. UTC
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>
---
 ui/ncurses/nc-cui.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Stewart Smith Nov. 9, 2016, 11:32 p.m. UTC | #1
Samuel Mendoza-Jonas <sam@mendozajonas.com> writes:
> 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>

Acked-by: Stewart Smith <stewart@linux.vnet.ibm.com>

(and also should be CC stable IMHO)

Patch
diff mbox

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index c2f1c83..dbb8034 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -951,13 +951,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);
 		}
 	}