svn commit: r276400 - head/release

[Glen Barber]

Author: gjb
Date: Tue Dec 30 03:35:26 2014
New Revision: 276400
URL: https://svnweb.freebsd.org/changeset/base/276400

Log:
  Use the correct loader.conf(5) entry for deferring the
  mountroot prompt.
  
  Prodded by:	ian
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Tue Dec 30 03:31:42 2014	(r276399)
+++ head/release/Makefile	Tue Dec 30 03:35:26 2014	(r276400)
@@ -201,7 +201,7 @@ system: packagesystem
 	echo sendmail_enable=\"NONE\" > release/etc/rc.conf
 	echo hostid_enable=\"NO\" >> release/etc/rc.conf
 	echo debug.witness.trace=0 >> release/etc/sysctl.conf
-	echo kern.cam.boot_delay=\"10000\" >> release/boot/loader.conf
+	echo vfs.mountroot.timeout=\"10\" >> release/boot/loader.conf
 	cp ${.CURDIR}/rc.local release/etc
 	touch ${.TARGET}
 
@@ -227,7 +227,7 @@ bootonly: packagesystem
 	echo sendmail_enable=\"NONE\" > bootonly/etc/rc.conf
 	echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
 	echo debug.witness.trace=0 >> bootonly/etc/sysctl.conf
-	echo kern.cam.boot_delay=\"10000\" >> bootonly/boot/loader.conf
+	echo vfs.mountroot.timeout=\"10\" >> bootonly/boot/loader.conf
 	cp ${.CURDIR}/rc.local bootonly/etc
 
 dvd:
@@ -250,7 +250,7 @@ dvd:
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
 	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
-	echo kern.cam.boot_delay=\"10000\" >> ${.TARGET}/boot/loader.conf
+	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 	touch ${.TARGET}