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

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 191ec33..64fc9fa 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <errno.h>
 #include <mntent.h>
+#include <locale.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/mount.h>
@@ -625,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;
@@ -785,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;
@@ -922,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;