From 4c03332555b2d87029be525f854a42bb90bc4e4b Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Wed, 23 Aug 2017 11:05:58 +1000 Subject: [PATCH 1/1] discover/device-handler: Disable safe mode warning on reinit If a user pressed "Rescan Devices" in safe mode the reinit would complete successfully, but the big warning that safe mode is active would remain. On reinit clear the safe_mode flag properly. This has no functional change aside from clearing the UI warning - the IPMI override remains active until cleared or a successful boot occurs. Signed-off-by: Samuel Mendoza-Jonas (cherry picked from commit b9b5fa357e5921eb752e62f7146339007d9f767f) --- discover/device-handler.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/discover/device-handler.c b/discover/device-handler.c index ec1eee3..efeb626 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -349,6 +350,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); @@ -384,6 +386,14 @@ void device_handler_reinit(struct device_handler *handler) handler->ramdisks = NULL; handler->n_ramdisks = 0; + /* 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); } -- 2.39.2