From: Samuel Mendoza-Jonas Date: Wed, 13 Apr 2016 05:07:38 +0000 (+1000) Subject: discover: Perform pre-boot steps when timeout expires X-Git-Tag: v1.0.1~6 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=8569abdf356aa617ebdcb426aa708a0fd8129a1a;ds=inline discover: Perform pre-boot steps when timeout expires When a default boot timeout expires boot() is called via default_timeout() rather than device_handler_boot(). default_timeout() doesn't call platform_pre_boot() beforehand, which means steps such as clearing a temporary boot device override are skipped. Add a call to platform_pre_boot() immediately before boot() to ensure these steps are performed regardless of boot type. Signed-off-by: Samuel Mendoza-Jonas --- diff --git a/discover/device-handler.c b/discover/device-handler.c index 489ecd7..43b9541 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -445,6 +445,8 @@ static int default_timeout(void *arg) pb_log("Timeout expired, booting default option %s\n", opt->option->id); + platform_pre_boot(); + handler->pending_boot = boot(handler, handler->default_boot_option, NULL, handler->dry_run, boot_status, handler); handler->pending_boot_is_default = true;