Date: Fri, 6 Apr 2018 16:59:58 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332115 - in stable/11/stand: . arm/loader defaults forth mips/uboot Message-ID: <201804061659.w36GxwEr051645@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Apr 6 16:59:58 2018 New Revision: 332115 URL: https://svnweb.freebsd.org/changeset/base/332115 Log: MFC r330005-r330007, r330021, r330029, r330622, r331207: Solo loader.conf(5) r330005: Go back to one loader.conf We really only need one loader.conf. The other loader.conf was created because the current one took forever to parse in FORTH. That will be fixed in the next commit. r330006: Take a meat cleaver to defaults/loader.conf Remove almost all of the _load=XXX options (kept only those relevant to splash screens, since there were other settings). Remove the excessively cutesy comment blocks. Remove excessive comments and replace with similar content Remove gratuitous blank lines (while leaving some) We have too many modules to list them all here. There's no purpose in doing so and it's a giant hassle to maintain. In addition the extra ~500 lines slow this down on small platforms. It slowed it down so much small platforms forked, which caused other issues... This is a compromise between those two extremes. r330007: loader.conf is loader agnostic, so remove 4th references. r330021: These two directories build man pages, so it's incorrect to tag them NO_OBJ. Also, make sure the loader.conf.5 man gets built and installed. r330029: Fix a typo: "now" -> "no". r330622: loader.conf(5): Document some other settings These tend to have less coverage in other places and they don't have defaults as of yet, so mention them here: - fdt_overlays - kernels_autodetect (lualoader only) r331207: loader.conf: remove obsolete non-x86 beastie menu statement As of r330005 the same loader.conf defaults are used on all platforms. Added: stable/11/stand/defaults/ - copied from r330007, head/stand/defaults/ Deleted: stable/11/stand/arm/loader/loader.conf stable/11/stand/forth/loader.conf stable/11/stand/forth/loader.conf.5 stable/11/stand/mips/uboot/loader.conf Modified: stable/11/stand/Makefile stable/11/stand/defaults/Makefile stable/11/stand/defaults/loader.conf stable/11/stand/defaults/loader.conf.5 stable/11/stand/forth/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/stand/Makefile ============================================================================== --- stable/11/stand/Makefile Fri Apr 6 16:48:11 2018 (r332114) +++ stable/11/stand/Makefile Fri Apr 6 16:59:58 2018 (r332115) @@ -9,6 +9,7 @@ SUBDIR+= ficl SUBDIR+= forth .endif +SUBDIR+= defaults SUBDIR+= man .include <bsd.arch.inc.mk> Modified: stable/11/stand/defaults/Makefile ============================================================================== --- head/stand/defaults/Makefile Mon Feb 26 03:16:57 2018 (r330007) +++ stable/11/stand/defaults/Makefile Fri Apr 6 16:59:58 2018 (r332115) @@ -1,11 +1,9 @@ # $FreeBSD$ -NO_OBJ=t - .include <bsd.init.mk> FILES+= loader.conf -FILES+= loader.conf.5 +MAN+= loader.conf.5 FILESDIR_loader.conf= /boot/defaults Modified: stable/11/stand/defaults/loader.conf ============================================================================== --- head/stand/defaults/loader.conf Mon Feb 26 03:16:57 2018 (r330007) +++ stable/11/stand/defaults/loader.conf Fri Apr 6 16:59:58 2018 (r332115) @@ -69,7 +69,7 @@ acpi_video_load="NO" # Load the ACPI video extension #loader_delay="3" # Delay in seconds before loading anything. # Default is unset and disabled (no delay). #autoboot_delay="10" # Delay in seconds before autobooting, - # -1 for now user interrupts, NO to disable + # -1 for no user interrupts, NO to disable #password="" # Prevent changes to boot options #bootlock_password="" # Prevent booting (see check-password.4th(8)) #geom_eli_passphrase_prompt="NO" # Prompt for geli(8) passphrase to mount root Modified: stable/11/stand/defaults/loader.conf.5 ============================================================================== --- head/stand/defaults/loader.conf.5 Mon Feb 26 03:16:57 2018 (r330007) +++ stable/11/stand/defaults/loader.conf.5 Fri Apr 6 16:59:58 2018 (r332115) @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd January 6, 2016 +.Dd March 19, 2018 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -249,7 +249,6 @@ be displayed. If set to .Dq YES , the beastie boot menu will be skipped. -The beastie boot menu is always skipped if running non-x86 hardware. .It Va loader_logo Pq Dq Li orbbw Selects a desired logo in the beastie boot menu. Possible values are: @@ -277,6 +276,23 @@ See the entropy entries in .Pq Dq /boot/entropy The name of the very early boot-time entropy cache file. +.El +.Sh OTHER SETTINGS +Other settings that may be used in +.Nm +that have no default value: +.Bl -tag -width bootfile -offset indent +.It Va fdt_overlays +Specifies a comma-delimited list of FDT overlays to apply. +.Pa /boot/overlays +is created by default for overlays to be placed in. +.It Va kernels_autodetect +If set to +.Dq YES , +attempt to auto-detect kernels installed in +.Pa /boot . +This is an option specific to the Lua-based loader. +It is not available in the default Forth-based loader. .El .Sh FILES .Bl -tag -width /boot/defaults/loader.conf -compact Modified: stable/11/stand/forth/Makefile ============================================================================== --- stable/11/stand/forth/Makefile Fri Apr 6 16:48:11 2018 (r332114) +++ stable/11/stand/forth/Makefile Fri Apr 6 16:59:58 2018 (r332115) @@ -7,7 +7,6 @@ MAN+= beastie.4th.8 \ check-password.4th.8 \ color.4th.8 \ delay.4th.8 \ - loader.conf.5 \ loader.4th.8 \ menu.4th.8 \ menusets.4th.8 \ @@ -33,10 +32,9 @@ FILES+= screen.4th FILES+= shortcuts.4th FILES+= support.4th FILES+= version.4th -FILESDIR_loader.conf= /boot/defaults # Allow machine specific loader.rc to be installed. -.for f in loader.rc menu.rc loader.conf +.for f in loader.rc menu.rc .if exists(${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f}) FILES+= ${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f} .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804061659.w36GxwEr051645>