]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
stand/lua: always allow overriding with local config files
authorStéphane Rochoy <stephane.rochoy@stormshield.eu>
Thu, 21 Dec 2023 14:05:58 +0000 (15:05 +0100)
committerWarner Losh <imp@FreeBSD.org>
Fri, 2 Feb 2024 18:58:28 +0000 (11:58 -0700)
commitd3d0b735571d9562812ce5b343a6e91f7a795dbe
treef344c7a5c26f27f352902c1d651a1b299f6cf000
parent754cac4b283eb024a3a6a194130199c860e32ebf
stand/lua: always allow overriding with local config files

Loader now also read configuration files listed in local_loader_conf_files.
Files listed here are the last ones read. And /boot/loader.conf.local was
moved from loader_conf_files to local_loader_conf_files leaving only
loader.conf and device.hints in loader_conf_files by default.

The idea is to ensure local_loader_conf_files, i.e., /boot/loader.conf.local,
can always be used to override other user defined settings.

So the sequencing is now as follow:

 1. Bootstrap:
     /boot/defaults/loader.conf

 2. Read loader_conf_files files:
     /boot/device.hints
     /boot/loader.conf

 3. Read loader_conf_dirs files:
     /boot/loader.conf.d/*.conf

 4. And finally, rread local_loader_conf_files files:
     /boot/loader.conf.local
UPDATING
stand/defaults/loader.conf
stand/defaults/loader.conf.5
stand/lua/config.lua
stand/lua/config.lua.8