X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=64fc9fab2a5031556ea5e27a76be98903629999a;hp=2164b223b180f6b67176c5b656b1b9f34e42c299;hb=f69fabee4a120cebaeff2359350e62bd960088f4;hpb=0bc40319b0dcf8f97889a51ec9bc996fa741126c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 2164b22..64fc9fa 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -626,6 +626,7 @@ struct discover_context *device_handler_discover_context_create(
 
 	ctx = talloc_zero(handler, struct discover_context);
 	ctx->device = device;
+	ctx->network = handler->network;
 	list_init(&ctx->boot_options);
 
 	return ctx;
@@ -786,6 +787,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 +927,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;