X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=33e3c8cfdf03e99e699efe391b973a0337ad34c6;hp=f1a392f4edca19e66762b51f8817d5b7bd89d045;hb=refs%2Fheads%2Fpetitboot-1.5.x;hpb=6d2a87621073b00bb9d6c1fb1c7c8837d85d6bc3

diff --git a/discover/device-handler.c b/discover/device-handler.c
index f1a392f..33e3c8c 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -18,6 +18,7 @@
 #include <process/process.h>
 #include <url/url.h>
 #include <i18n/i18n.h>
+#include <pb-config/pb-config.h>
 
 #include <sys/sysmacros.h>
 #include <sys/types.h>
@@ -367,6 +368,7 @@ void device_handler_reinit(struct device_handler *handler)
 {
 	struct discover_boot_option *opt, *tmp;
 	struct ramdisk_device *ramdisk;
+	struct config *config;
 	unsigned int i;
 
 	device_handler_cancel_default(handler);
@@ -405,6 +407,14 @@ void device_handler_reinit(struct device_handler *handler)
 
 	set_env_variables(config_get());
 
+	/* If the safe mode warning was active disable it now */
+	if (config_get()->safe_mode) {
+		config = config_copy(handler, config_get());
+		config->safe_mode = false;
+		config_set(config);
+		discover_server_notify_config(handler->server, config);
+	}
+
 	device_handler_reinit_sources(handler);
 }