Date: Tue, 15 Jun 2010 23:55:42 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r209225 - head/tools/tools/nanobsd Message-ID: <201006152355.o5FNtgKo031329@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Jun 15 23:55:42 2010 New Revision: 209225 URL: http://svn.freebsd.org/changeset/base/209225 Log: 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 Modified: head/tools/tools/nanobsd/nanobsd.sh Modified: head/tools/tools/nanobsd/nanobsd.sh ============================================================================== --- head/tools/tools/nanobsd/nanobsd.sh Tue Jun 15 22:23:21 2010 (r209224) +++ head/tools/tools/nanobsd/nanobsd.sh Tue Jun 15 23:55:42 2010 (r209225) @@ -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 ) #######################################################################
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006152355.o5FNtgKo031329>