Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Feb 2024 17:59:33 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 552f3072af54 - main - loader/lua: Remove workaround for command_error
Message-ID:  <202402291759.41THxXSl077687@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=552f3072af54820cf1805f712e2567bc1b7f046d

commit 552f3072af54820cf1805f712e2567bc1b7f046d
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-02-29 17:58:59 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-02-29 17:58:59 +0000

    loader/lua: Remove workaround for command_error
    
    loader.command_error was available prior to stable/12 branching. No need
    to check if it is available or not.
    
    Sponsored by:           Netflix
    Reviewed by:            kevans
    Differential Revision:  https://reviews.freebsd.org/D44144
---
 stand/lua/config.lua | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/stand/lua/config.lua b/stand/lua/config.lua
index 86f5ef6174a2..ba6144364247 100644
--- a/stand/lua/config.lua
+++ b/stand/lua/config.lua
@@ -407,12 +407,7 @@ local function loadModule(mod, silent)
 			end
 
 			if cli_execute_unparsed(str) ~= 0 then
-				-- XXX Temporary shim: don't break the boot if
-				-- loader hadn't been recompiled with this
-				-- function exposed.
-				if loader.command_error then
-					print(loader.command_error())
-				end
+				print(loader.command_error())
 				if not silent then
 					print("failed!")
 				end



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402291759.41THxXSl077687>