diff options
| author | gjb <gjb@FreeBSD.org> | 2015-07-09 15:56:51 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-07-09 15:56:51 +0000 |
| commit | 218a371ceba814cf44039d8206b111ecba858d70 (patch) | |
| tree | 472456e82a3d0a5bd00712049b7f692c74efb908 /release | |
| parent | e9222c7afa737129005e2eb7069a9136b82170e8 (diff) | |
| download | FreeBSD-src-218a371ceba814cf44039d8206b111ecba858d70.zip FreeBSD-src-218a371ceba814cf44039d8206b111ecba858d70.tar.gz | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/release/Makefile b/release/Makefile index 104b73e..e959760 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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} |
