discover: place countdown earlier in boot status messages
authorJeremy Kerr <jk@ozlabs.org>
Mon, 5 May 2014 03:43:13 +0000 (11:43 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Wed, 16 Jul 2014 00:47:46 +0000 (08:47 +0800)
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>
discover/device-handler.c

index dd3aee92ca35d0385880b190f60a379494152ad8..c21eb286d2bd8b47d361fad1c537c883e50fdbbc 100644 (file)
@@ -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);