summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2011-07-20 15:18:24 +0000
committerjhb <jhb@FreeBSD.org>2011-07-20 15:18:24 +0000
commit3b7c35151f642d511598902ef704ae83c58b9838 (patch)
tree8f24718f3e53de804d061809ac0971a21beb63a1
parentf77ff62fcde76417feef3dd10e1f0c07a604da21 (diff)
downloadFreeBSD-src-3b7c35151f642d511598902ef704ae83c58b9838.zip
FreeBSD-src-3b7c35151f642d511598902ef704ae83c58b9838.tar.gz
Note that the "kernel" variable in loader.conf is the name of a directory
containing a kernel under /boot and that it's default value is "kernel" not "/boot/kernel/kernel". PR: docs/158992 Reported by: Wayne Mitchell wayne.mitchell.iz at gmail Approved by: re (kib) MFC after: 1 week
-rw-r--r--sys/boot/forth/loader.conf.57
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index c8c61c6..fa83c8f 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -23,7 +23,7 @@
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD$
-.Dd January 16, 2008
+.Dd July 20, 2011
.Dt LOADER.CONF 5
.Os
.Sh NAME
@@ -107,6 +107,9 @@ present file.
Name of the kernel to be loaded.
If no kernel name is set, no additional
modules will be loaded.
+The name must be a subdirectory of
+.Pa /boot
+that contains a kernel.
.It Ar kernel_options
Flags to be passed to the kernel.
.It Ar password
@@ -190,7 +193,7 @@ replacing it with
.Dq spinning
character (useful for embedded products and such).
.It Va kernel
-.Pq Dq Pa /boot/kernel/kernel
+.Pq Dq kernel
.It Va loader_conf_files
.Pq Dq Pa /boot/loader.conf /boot/loader.conf.local
.It Va splash_bmp_load
OpenPOWER on IntegriCloud