a4f7035c09
Actual modules get require()'d in, rather than try_include(). All instances of try_include should be provided with proper hooks/API in the rest of loader to do the work they need to do, since we can't rely on them to exist. Convert this now to lfs + dofile since we won't really be treating them as modules. lfs is required because dofile will properly throw an error if the file doesn't exist, which is not in the spirit of 'optionally included'. Getting out of the pcall game allows us to provide a loader.exit() style call that backs out to the common bits of loader (autoboot sequence unless disabled with a loader.setenv("autoboot_delay", "NO")). The most ideal way identified so far to implement loader.exit() is to throw a special abort-style error that indicates to the caller in interp_lua that we've not actually errored out, just continue execution. Otherwise, we have to hack in logic to bubble up and return from loader.lua without continuing further, which gets kind of ugly depending on the context in which we're aborting. A compat shim is provided temporarily in case the executing loader doesn't yet have loader.lua_path, which was just added in r354246. |
||
---|---|---|
.. | ||
cli.lua | ||
cli.lua.8 | ||
color.lua | ||
color.lua.8 | ||
config.lua | ||
config.lua.8 | ||
core.lua | ||
core.lua.8 | ||
drawer.lua | ||
drawer.lua.8 | ||
hook.lua | ||
hook.lua.8 | ||
loader.lua | ||
logo-beastie.lua | ||
logo-beastiebw.lua | ||
logo-fbsdbw.lua | ||
logo-orb.lua | ||
logo-orbbw.lua | ||
Makefile | ||
menu.lua | ||
menu.lua.8 | ||
password.lua | ||
password.lua.8 | ||
screen.lua | ||
screen.lua.8 |