stand: Add /boot/overlays to allow separation of overlays from base FDT
This matches directory structure used commonly in Linux-land, and it's cleaner than mixing overlays into the existing module paths. Overlays are still mixed in by specifying fdt_overlays in loader.conf(5). Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D13922
This commit is contained in:
parent
6780e684d4
commit
db180ae55c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=328107
@ -18,6 +18,8 @@
|
|||||||
..
|
..
|
||||||
modules
|
modules
|
||||||
..
|
..
|
||||||
|
overlays
|
||||||
|
..
|
||||||
zfs
|
zfs
|
||||||
..
|
..
|
||||||
..
|
..
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93
|
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93
|
||||||
.\" $FreeBSD$
|
.\" $FreeBSD$
|
||||||
.\"
|
.\"
|
||||||
.Dd December 3, 2017
|
.Dd January 15, 2018
|
||||||
.Dt HIER 7
|
.Dt HIER 7
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -63,6 +63,11 @@ at boot time) and kernel modules
|
|||||||
third-party loadable kernel modules;
|
third-party loadable kernel modules;
|
||||||
see
|
see
|
||||||
.Xr kldstat 8
|
.Xr kldstat 8
|
||||||
|
.It Pa overlays/
|
||||||
|
Compiled flattened device tree (FDT) overlays; see
|
||||||
|
.Xr fdt 4
|
||||||
|
and
|
||||||
|
.Xr dtc 1
|
||||||
.It Pa zfs/
|
.It Pa zfs/
|
||||||
.Xr zfs 8
|
.Xr zfs 8
|
||||||
zpool cache files
|
zpool cache files
|
||||||
|
@ -7,7 +7,7 @@ autoboot_delay=10
|
|||||||
bootfile="kernel" # Kernel name (possibly absolute path)
|
bootfile="kernel" # Kernel name (possibly absolute path)
|
||||||
kernel="kernel" # /boot sub-directory containing kernel and modules
|
kernel="kernel" # /boot sub-directory containing kernel and modules
|
||||||
loader_conf_files="/boot/loader.conf /boot/loader.conf.local"
|
loader_conf_files="/boot/loader.conf /boot/loader.conf.local"
|
||||||
module_path="/boot/kernel;/boot/modules;/boot/dtb"
|
module_path="/boot/kernel;/boot/modules;/boot/dtb;/boot/overlays"
|
||||||
nextboot_conf="/boot/nextboot.conf"
|
nextboot_conf="/boot/nextboot.conf"
|
||||||
nextboot_enable="NO"
|
nextboot_enable="NO"
|
||||||
verbose_loading="NO"
|
verbose_loading="NO"
|
||||||
|
@ -97,7 +97,7 @@ bootenv_autolist="YES" # Auto populate the list of ZFS Boot Environments
|
|||||||
#comconsole_speed="9600" # Set the current serial console speed
|
#comconsole_speed="9600" # Set the current serial console speed
|
||||||
#console="vidconsole" # A comma separated list of console(s)
|
#console="vidconsole" # A comma separated list of console(s)
|
||||||
#currdev="disk1s1a" # Set the current device
|
#currdev="disk1s1a" # Set the current device
|
||||||
module_path="/boot/modules;/boot/dtb" # Set the module search path
|
module_path="/boot/modules;/boot/dtb;/boot/overlays" # Set the module search path
|
||||||
#prompt="\\${interpret}" # Set the command prompt
|
#prompt="\\${interpret}" # Set the command prompt
|
||||||
#root_disk_unit="0" # Force the root disk unit number
|
#root_disk_unit="0" # Force the root disk unit number
|
||||||
#rootdev="disk1s1a" # Set the root filesystem
|
#rootdev="disk1s1a" # Set the root filesystem
|
||||||
|
@ -7,7 +7,7 @@ autoboot_delay=10
|
|||||||
bootfile="kernel" # Kernel name (possibly absolute path)
|
bootfile="kernel" # Kernel name (possibly absolute path)
|
||||||
kernel="kernel" # /boot sub-directory containing kernel and modules
|
kernel="kernel" # /boot sub-directory containing kernel and modules
|
||||||
loader_conf_files="/boot/loader.conf /boot/loader.conf.local"
|
loader_conf_files="/boot/loader.conf /boot/loader.conf.local"
|
||||||
module_path="/boot/kernel;/boot/modules;/boot/dtb"
|
module_path="/boot/kernel;/boot/modules;/boot/dtb;/boot/overlays"
|
||||||
nextboot_conf="/boot/nextboot.conf"
|
nextboot_conf="/boot/nextboot.conf"
|
||||||
nextboot_enable="NO"
|
nextboot_enable="NO"
|
||||||
verbose_loading="NO"
|
verbose_loading="NO"
|
||||||
|
Loading…
Reference in New Issue
Block a user