Date: Sat, 14 May 2011 00:39:03 +0200 (CEST) From: Henrik Brix Andersen <brix@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Warner Losh <imp@FreeBSD.org> Subject: misc/157020: [nanobsd] Restore nanobsd.sh $NANO_BOOT2CFG functionality Message-ID: <20110513223903.AF03E1CC1B@drpepper.brixandersen.dk> Resent-Message-ID: <201105132300.p4DN0G9L038462@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157020
>Category: misc
>Synopsis: [nanobsd] Restore nanobsd.sh $NANO_BOOT2CFG functionality
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri May 13 23:00:15 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Henrik Brix Andersen
>Release: FreeBSD 9.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD drpepper.brixandersen.dk 9.0-CURRENT FreeBSD 9.0-CURRENT #2 r221582M: Thu May 12 23:24:30 CEST 2011 root@drpepper.brixandersen.dk:/usr/obj/usr/home/brix/projects/freebsd/src/head/sys/GENERIC i386
>Description:
The ability to set custom options for boot2 in nanobsd.sh added in r209210 was (accidentially?) removed in r212938.
>How-To-Repeat:
>Fix:
This patch restores the above functionality.
--- nanobsd.sh.diff begins here ---
Index: tools/tools/nanobsd/nanobsd.sh
===================================================================
--- tools/tools/nanobsd/nanobsd.sh (revision 221859)
+++ tools/tools/nanobsd/nanobsd.sh (working copy)
@@ -660,7 +660,7 @@
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
)
#######################################################################
--- nanobsd.sh.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110513223903.AF03E1CC1B>