svn commit: r276383 - head/release
Glen Barber
gjb at FreeBSD.org
Tue Dec 30 02:34:01 UTC 2014
On Mon, Dec 29, 2014 at 03:57:21PM -0700, Ian Lepore wrote:
> On Mon, 2014-12-29 at 22:32 +0000, Glen Barber wrote:
> > Author: gjb
> > Date: Mon Dec 29 22:32:39 2014
> > New Revision: 276383
> > URL: https://svnweb.freebsd.org/changeset/base/276383
> >
> > Log:
> > Delay dropping to the mountroot prompt for 10 seconds
> > in case the root device is not yet ready.
> >
> > Sponsored by: The FreeBSD Foundation
> >
> > Modified:
> > head/release/Makefile
> >
> > Modified: head/release/Makefile
> > ==============================================================================
> > --- head/release/Makefile Mon Dec 29 21:59:44 2014 (r276382)
> > +++ head/release/Makefile Mon Dec 29 22:32:39 2014 (r276383)
> > @@ -201,6 +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
> > cp ${.CURDIR}/rc.local release/etc
> > touch ${.TARGET}
> >
> > @@ -226,6 +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
> > cp ${.CURDIR}/rc.local bootonly/etc
> >
> > dvd:
> > @@ -248,6 +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
> > cp ${.CURDIR}/rc.local ${.TARGET}/etc
> > touch ${.TARGET}
> >
> >
>
> This will hard-wait for 10 seconds even if all devices are ready to roll
> much earlier than that. An alternative is to set kern.mountroot.timeout
> which will keep trying the available root devices until the timeout
> expires and then drop you to the prompt, with the benefit of only
> waiting 4 seconds if that's how long it really took the device to become
> ready. (The default for kern.mountroot.timeout is 3 seconds.)
>
Bah, you're right. I'll fix it once I get a few (unrelated, but
conflicting) changes committed.
Glen
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20141230/000bb5e7/attachment.sig>
More information about the svn-src-head
mailing list