From owner-svn-src-stable@FreeBSD.ORG  Fri Sep 16 18:18:38 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BDA48106564A;
	Fri, 16 Sep 2011 18:18:38 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ACCE78FC0C;
	Fri, 16 Sep 2011 18:18:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8GIIcDD033039;
	Fri, 16 Sep 2011 18:18:38 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8GIIcBf033037;
	Fri, 16 Sep 2011 18:18:38 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201109161818.p8GIIcBf033037@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 16 Sep 2011 18:18:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225623 - stable/8/sys/boot/forth
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Sep 2011 18:18:38 -0000

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