From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 5 May 2014 03:43:13 +0000 (+0800)
Subject: discover: place countdown earlier in boot status messages
X-Git-Tag: v1.0.0~167
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=49367fdd5034a010a3f7f657f8ad205ebf9a01fe

discover: place countdown earlier in boot status messages

The boot status messages may be trimmed on the right-hand side; In this
case, we'll lose the boot countdown.

This change moves the boot countdown time to before the arbitrary-length
label string.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/discover/device-handler.c b/discover/device-handler.c
index dd3aee9..c21eb28 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -373,7 +373,7 @@ static void countdown_status(struct device_handler *handler,
 	status.progress = -1;
 	status.detail = NULL;
 	status.message = talloc_asprintf(handler,
-			"Booting %s in %u sec", opt->option->name, sec);
+			"Booting in %d sec: %s", sec, opt->option->name);
 
 	discover_server_notify_boot_status(handler->server, &status);