From owner-freebsd-bugs@FreeBSD.ORG Fri May 13 23:00:16 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 881781065672 for ; Fri, 13 May 2011 23:00:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3959F8FC16 for ; Fri, 13 May 2011 23:00:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p4DN0G2N038465 for ; Fri, 13 May 2011 23:00:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4DN0G9L038462; Fri, 13 May 2011 23:00:16 GMT (envelope-from gnats) Resent-Date: Fri, 13 May 2011 23:00:16 GMT Resent-Message-Id: <201105132300.p4DN0G9L038462@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Henrik Brix Andersen Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AE17106566B; Fri, 13 May 2011 22:57:54 +0000 (UTC) (envelope-from brix@drpepper.brixandersen.dk) Received: from solow.pil.dk (relay.pil.dk [195.41.47.164]) by mx1.freebsd.org (Postfix) with ESMTP id C1E518FC13; Fri, 13 May 2011 22:57:53 +0000 (UTC) Received: from drpepper.brixandersen.dk (0x55534f5f.adsl.cybercity.dk [85.83.79.95]) by solow.pil.dk (Postfix) with ESMTPA id 630161CC00F; Sat, 14 May 2011 00:39:04 +0200 (CEST) Received: by drpepper.brixandersen.dk (Postfix, from userid 1001) id AF03E1CC1B; Sat, 14 May 2011 00:39:03 +0200 (CEST) Message-Id: <20110513223903.AF03E1CC1B@drpepper.brixandersen.dk> Date: Sat, 14 May 2011 00:39:03 +0200 (CEST) From: Henrik Brix Andersen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Warner Losh Subject: misc/157020: [nanobsd] Restore nanobsd.sh $NANO_BOOT2CFG functionality X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Henrik Brix Andersen List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2011 23:00:16 -0000 >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: