discover/grub2: improve handling of word & delimiter tokens

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 2164b223b180f6b67176c5b656b1b9f34e42c299..7cf52636e56766db936d3bdb70ff104b17dd7797 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -786,6 +786,9 @@ void device_handler_boot(struct device_handler *handler,
 
        if (handler->pending_boot)
                boot_cancel(handler->pending_boot);
+
+       platform_finalise_config();
+
        handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
                        boot_status, handler);
        handler->pending_boot_is_default = false;
@@ -923,6 +926,12 @@ void device_handler_process_url(struct device_handler *handler,
        status->detail = talloc_asprintf(status,
                        _("Received config URL %s"), url);
 
+       if (!handler->network) {
+               status->message = talloc_asprintf(handler,
+                                       _("No network configured"));
+               goto msg;
+       }
+
        event = talloc(handler, struct event);
        event->type = EVENT_TYPE_USER;
        event->action = EVENT_ACTION_CONF;