From owner-svn-src-all@FreeBSD.ORG  Tue Aug 30 11:49:23 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1932B106564A;
	Tue, 30 Aug 2011 11:49:23 +0000 (UTC)
	(envelope-from marck@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0914A8FC19;
	Tue, 30 Aug 2011 11:49:23 +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 p7UBnMPg050084;
	Tue, 30 Aug 2011 11:49:22 GMT (envelope-from marck@svn.freebsd.org)
Received: (from marck@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7UBnMHr050082;
	Tue, 30 Aug 2011 11:49:22 GMT (envelope-from marck@svn.freebsd.org)
Message-Id: <201108301149.p7UBnMHr050082@svn.freebsd.org>
From: Dmitry Morozovsky <marck@FreeBSD.org>
Date: Tue, 30 Aug 2011 11:49:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225260 - stable/7/sys/boot/forth
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Aug 2011 11:49:23 -0000

Author: marck (doc committer)
Date: Tue Aug 30 11:49:22 2011
New Revision: 225260
URL: http://svn.freebsd.org/changeset/base/225260

Log:
  MFC r225122:
  
   Add kern.cam.boot_delay description (with reasonable default) to
   default/loader.conf
  
   This should help people installing ${OS} to USB devices, where there are
   frequently cases where kernel tries to mount root before actual umass sensing
   is finished.
  
  Reviewed by:	mav
  Approved by:	kib

Modified:
  stable/7/sys/boot/forth/loader.conf
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/boot/forth/loader.conf
==============================================================================
--- stable/7/sys/boot/forth/loader.conf	Tue Aug 30 11:47:36 2011	(r225259)
+++ stable/7/sys/boot/forth/loader.conf	Tue Aug 30 11:49:22 2011	(r225260)
@@ -102,6 +102,8 @@ module_path="/boot/modules"	# Set the mo
 #kern.nbuf=""			# Set the number of buffer headers
 #kern.ncallout=""		# Set the maximum # of timer events
 #kern.sgrowsiz=""		# Set the amount to grow stack
+#kern.cam.boot_delay="10000"	# Delay (in ms) of root mount for CAM bus
+				# registration, useful for USB sticks as root
 #kern.cam.scsi_delay="2000"	# Delay (in ms) before probing SCSI
 #kern.ipc.maxsockets=""		# Set the maximum number of sockets avaliable
 #kern.ipc.nmbclusters=""	# Set the number of mbuf clusters