The branch stable/14 has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=216c56ff1df63ae61431b20aab722e9f8a5f2b44
commit 216c56ff1df63ae61431b20aab722e9f8a5f2b44
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2024-02-29 17:58:52 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2024-04-16 19:54:28 +0000
loader/lua: Remove compat shim for loader.lua_path
loader.lua_path was committed before stable/13 was branched, and merged
in to for 12.2. Remove workaround for it not being present.
Sponsored by: Netflix
Reviewed by: kevans
Differential Revision: https://reviews.freebsd.org/D44143
(cherry picked from commit ab97d42addae97a389c6f22d6bba62ed954bb8e7)
---
stand/lua/core.lua | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/stand/lua/core.lua b/stand/lua/core.lua
index 9226de564348..eaabff6a7602 100644
--- a/stand/lua/core.lua
+++ b/stand/lua/core.lua
@@ -65,13 +65,7 @@ end
-- message on failure.
function try_include(module)
if module:sub(1, 1) ~= "/" then
- local lua_path = loader.lua_path
- -- XXX Temporary compat shim; this should be removed once the
- -- loader.lua_path export has sufficiently spread.
- if lua_path == nil then
- lua_path = "/boot/lua"
- end
- module = lua_path .. "/" .. module
+ module = loader.lua_path .. "/" .. module
-- We only attempt to append an extension if an absolute path
-- wasn't specified. This assumes that the caller either wants
-- to treat this like it would require() and specify just the
