From 041929aab15b0490a41c978a6ec4c3585a68ce3e Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Wed, 24 Oct 2018 03:14:10 +0000
Subject: [PATCH] menu.lua: Abort autoboot sequence on failed command

Currently, a timeout in the menu autoboot sequence would effectively do
nothing. We would return from the autoboot handling, then begin processing
the menu without redrawing it.

This change makes the behavior a little more friendly. Returning the user to
the menu can't have any good effects, so abort the autoboot sequence and
drop to the loader prompt.

MFC after:	3 days
---
 stand/lua/menu.lua | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua
index 9273f599472..03c44bfb7c4 100644
--- a/stand/lua/menu.lua
+++ b/stand/lua/menu.lua
@@ -373,7 +373,9 @@ function menu.process(menudef, keypress)
 			break
 		elseif key == core.KEY_ENTER then
 			core.boot()
-			-- Should not return
+			-- Should not return.  If it does, escape menu handling
+			-- and drop to loader prompt.
+			return false
 		end
 
 		key = string.char(key)
@@ -404,6 +406,7 @@ function menu.process(menudef, keypress)
 end
 
 function menu.run()
+	local autoboot_key
 	local delay = loader.getenv("autoboot_delay")
 
 	if delay ~= nil and delay:lower() == "no" then
@@ -419,7 +422,16 @@ function menu.run()
 
 	menu.draw(menu.default)
 
-	local autoboot_key = menu.autoboot(delay)
+	if delay ~= nil then
+		autoboot_key = menu.autoboot(delay)
+
+		-- autoboot_key should return the key pressed.  It will only
+		-- return nil if we hit the timeout and executed the timeout
+		-- command.  Bail out.
+		if autoboot_key == nil then
+			return
+		end
+	end
 
 	menu.process(menu.default, autoboot_key)
 	drawn_menu = nil
@@ -429,11 +441,6 @@ function menu.run()
 end
 
 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
-	end
 	local x = loader.getenv("loader_menu_timeout_x") or 4
 	local y = loader.getenv("loader_menu_timeout_y") or 23
 	local endtime = loader.time() + delay
@@ -467,6 +474,7 @@ function menu.autoboot(delay)
 
 	local cmd = loader.getenv("menu_timeout_command") or "boot"
 	cli_execute_unparsed(cmd)
+	return nil
 end
 
 -- CLI commands