Attachment 197716 Details for Bug 231610 – Lift autoboot_delay processing up a level

[patch] Lift autoboot_delay processing up a level

autoboot-delay.diff (text/plain), 1.30 KB, created by Kyle Evans on 2018-10-02 15:27:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2018-10-02 15:27:28 UTC

Size: 1.30 KB

patch

obsolete

>Index: stand/lua/menu.lua
>===================================================================
>--- stand/lua/menu.lua	(revision 339040)
>+++ stand/lua/menu.lua	(working copy)
>@@ -401,9 +401,23 @@ function menu.process(menudef, keypress)
> end
> 
> function menu.run()
>+	local delay = loader.getenv("autoboot_delay")
>+
>+	if delay ~= nil and delay:lower() == "no" then
>+		delay = nil
>+	else
>+		delay = tonumber(delay) or 10
>+	end
>+
>+	if delay == -1 then
>+		core.boot()
>+		return
>+	end
>+
> 	menu.draw(menu.default)
>-	local autoboot_key = menu.autoboot()
> 
>+	local autoboot_key = menu.autoboot(delay)
>+
> 	menu.process(menu.default, autoboot_key)
> 	drawn_menu = nil
> 
>@@ -411,19 +425,15 @@ function menu.run()
> 	print("Exiting menu!")
> end
> 
>-function menu.autoboot()
>-	local ab = loader.getenv("autoboot_delay")
>-	if ab ~= nil and ab:lower() == "no" then
>+function menu.autoboot(delay)
>+	-- If we've specified a nil delay, we can do nothing but assume that
>+	-- we aren't supposed to be autobooting.
>+	if delay == nil then
> 		return nil
>-	elseif tonumber(ab) == -1 then
>-		core.boot()
> 	end
>-	ab = tonumber(ab) or 10
>-
> 	local x = loader.getenv("loader_menu_timeout_x") or 4
> 	local y = loader.getenv("loader_menu_timeout_y") or 23
>-
>-	local endtime = loader.time() + ab
>+	local endtime = loader.time() + delay
> 	local time
> 	local last
> 	repeat

Actions: View | Diff

Attachments on bug 231610: 197710 | 197716