diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-07-10 01:50:15 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-12-31 16:37:05 +0000 |
| commit | 72cf7db3aaf17db412183886f19320e5074dc8b7 (patch) | |
| tree | 24466425beff45937b4119cec8f073599f89db75 /stand/defaults/loader.conf | |
| parent | 37df9d3bba8577fcdd63382ff5a4a5cbb4aa55b4 (diff) | |
| download | src-72cf7db3aaf17db412183886f19320e5074dc8b7.tar.gz src-72cf7db3aaf17db412183886f19320e5074dc8b7.zip | |
lualoader: add loader_conf_dirs support (loader.conf.d)
loader_conf_dirs is the supporting mechanism for the included
/boot/loader.conf.d directory. When lualoader finishes processing all of
the loader_conf_files it finds after walking /boot/defaults/loader.conf,
it will now check any and all loader_conf_dirs and process files ending
in ".conf" as if they were a loader.conf.
Note that loader_conf_files may be specified in a loader.conf.d config
file, but loader_conf_dirs may *not*. It will only be processed as specified
in /boot/defaults/loader.conf and any loader_conf_files that were loaded
from there.
Reviewed by: allanjude, freqlabs, rpokala, tsoome
Includes suggestion from: imp
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D25608
Diffstat (limited to 'stand/defaults/loader.conf')
| -rw-r--r-- | stand/defaults/loader.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index 55f9983dfc8b..7bca621e6703 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -15,6 +15,7 @@ kernel="kernel" # /boot sub-directory containing kernel and modules bootfile="kernel" # Kernel name (possibly absolute path) kernel_options="" # Flags to be passed to the kernel loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local" +loader_conf_dirs="/boot/loader.conf.d" nextboot_conf="/boot/nextboot.conf" verbose_loading="NO" # Set to YES for verbose loader output |