types: shorten boot_status definitions

[petitboot] / ui / ncurses / nc-cui.c

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index dfe8099b9a8fb048016c08e3d5806b37ee4973cb..a6537cb46b2b9e46a353d383e6c7ec8c5fad4c39 100644 (file)
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -694,13 +694,13 @@ static void cui_device_remove(struct device *dev, void *arg)
                nc_scr_post(cui->current);
 }
 
-static void cui_update_status(struct boot_status *status, void *arg)
+static void cui_update_status(struct status *status, void *arg)
 {
        struct cui *cui = cui_from_arg(arg);
 
        nc_scr_status_printf(cui->current,
                        "%s: %s",
-                       status->type == BOOT_STATUS_ERROR ?
+                       status->type == STATUS_ERROR ?
                                _("Error") : _("Info"),
                        status->message);
 
@@ -981,13 +981,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);
                }
        }