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 <sam@mendozajonas.com>
#include <process/process.h>
#include <url/url.h>
#include <i18n/i18n.h>
#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>
#include <sys/sysmacros.h>
#include <sys/types.h>
{
struct discover_boot_option *opt, *tmp;
struct ramdisk_device *ramdisk;
{
struct discover_boot_option *opt, *tmp;
struct ramdisk_device *ramdisk;
unsigned int i;
device_handler_cancel_default(handler);
unsigned int i;
device_handler_cancel_default(handler);
set_env_variables(config_get());
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);
}
device_handler_reinit_sources(handler);
}