summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-06-15 23:55:42 +0000
committerimp <imp@FreeBSD.org>2010-06-15 23:55:42 +0000
commitb6af132fc750123c48e55c0b472d1ef8a732dc5a (patch)
tree762a808a4b497b658f8d462cd8ec38e2f56754f9 /tools
parentcb8c5b97a1adf75b295794bc74d8810617da0ca4 (diff)
downloadFreeBSD-src-b6af132fc750123c48e55c0b472d1ef8a732dc5a.zip
FreeBSD-src-b6af132fc750123c48e55c0b472d1ef8a732dc5a.tar.gz
Allow boot.config to have different values than just -h.
Submitted by: bsdrp by way of freenas and olivier cochard-labbe MFC after: 3 days
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/nanobsd/nanobsd.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 811c58b..8f38846 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -124,6 +124,10 @@ NANO_HEADS=16
NANO_BOOT0CFG="-o packet -s 1 -m 3"
NANO_BOOTLOADER="boot/boot0sio"
+# boot2 flags/options
+# default force serial console
+NANO_BOOT2CFG="-h"
+
# Backing type of md(4) device
# Can be "file" or "swap"
NANO_MD_BACKING="file"
@@ -608,7 +612,7 @@ cust_comconsole () (
sed -i "" -e '/^ttyv[0-8]/s/ on/ off/' ${NANO_WORLDDIR}/etc/ttys
# Tell loader to use serial console early.
- echo " -h" > ${NANO_WORLDDIR}/boot.config
+ echo "${NANO_BOOT2CFG}" > ${NANO_WORLDDIR}/boot.config
)
#######################################################################
OpenPOWER on IntegriCloud