svn commit: r285322 - stable/10/release

[Glen Barber]

Author: gjb
Date: Thu Jul  9 15:56:51 2015
New Revision: 285322
URL: https://svnweb.freebsd.org/changeset/base/285322

Log:
  MFC r276383, r276400:
  
   r276383:
    Delay dropping to the mountroot prompt for 10 seconds
    in case the root device is not yet ready.
  
   r276400:
    Use the correct loader.conf(5) entry for deferring the
    mountroot prompt.
  
  Approved by:	re (marius)
  Reminded by:	hrs
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile	Thu Jul  9 15:19:45 2015	(r285321)
+++ stable/10/release/Makefile	Thu Jul  9 15:56:51 2015	(r285322)
@@ -198,6 +198,7 @@ disc1: packagesystem
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 	touch ${.TARGET}
 
@@ -222,6 +223,7 @@ bootonly: packagesystem
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 
 dvd: packagesystem
@@ -240,6 +242,7 @@ dvd: packagesystem
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+	echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 	touch ${.TARGET}