svn commit: r225623 - stable/8/sys/boot/forth

John Baldwin jhb at FreeBSD.org
Fri Sep 16 18:18:38 UTC 2011


Author: jhb
Date: Fri Sep 16 18:18:38 2011
New Revision: 225623
URL: http://svn.freebsd.org/changeset/base/225623

Log:
  MFC 224228:
  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".

Modified:
  stable/8/sys/boot/forth/loader.conf.5
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/boot/forth/loader.conf.5
==============================================================================
--- stable/8/sys/boot/forth/loader.conf.5	Fri Sep 16 17:47:12 2011	(r225622)
+++ stable/8/sys/boot/forth/loader.conf.5	Fri Sep 16 18:18:38 2011	(r225623)
@@ -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
@@ -185,7 +188,7 @@ selects the video console, and
 selects a mute console
 (useful for systems with neither a video console nor a serial port).
 .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


More information about the svn-src-stable-8 mailing list