diff options
author | gjb <gjb@FreeBSD.org> | 2014-12-30 03:35:26 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2014-12-30 03:35:26 +0000 |
commit | 0c5826d4a3ef42894873b55ae0a6c76da4ac6eb3 (patch) | |
tree | 6333033630fa0b727ebb4287fd5f970647723a29 /release/Makefile | |
parent | 89ea4550747416014ce82e32c69b6ec6cf136ca9 (diff) | |
download | FreeBSD-src-0c5826d4a3ef42894873b55ae0a6c76da4ac6eb3.zip FreeBSD-src-0c5826d4a3ef42894873b55ae0a6c76da4ac6eb3.tar.gz |
Use the correct loader.conf(5) entry for deferring the
mountroot prompt.
Prodded by: ian
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/Makefile')
-rw-r--r-- | release/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index c09081a..b69aba4 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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} |