From brix@drpepper.brixandersen.dk  Fri May 13 22:57:54 2011
Return-Path: <brix@drpepper.brixandersen.dk>
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 <brix@FreeBSD.org>
Reply-To: Henrik Brix Andersen <brix@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Warner Losh <imp@FreeBSD.org>
Subject: [nanobsd] Restore nanobsd.sh $NANO_BOOT2CFG functionality
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         157020
>Category:       misc
>Synopsis:       [nanobsd] Restore nanobsd.sh $NANO_BOOT2CFG functionality
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    imp
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 13 23:00:15 UTC 2011
>Closed-Date:    Fri May 13 22:33:09 MDT 2011
>Last-Modified:  Sat May 14 04:40:11 UTC 2011
>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:
Responsible-Changed-From-To: freebsd-bugs->imp 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat May 14 01:47:42 UTC 2011 
Responsible-Changed-Why:  
Over to a likely suspect. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157020 
State-Changed-From-To: open->closed 
State-Changed-By: imp 
State-Changed-When: Fri May 13 22:32:53 MDT 2011 
State-Changed-Why:  
Fixed.  Thanks! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=157020 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/157020: commit references a PR
Date: Sat, 14 May 2011 04:32:40 +0000 (UTC)

 Author: imp
 Date: Sat May 14 04:32:30 2011
 New Revision: 221877
 URL: http://svn.freebsd.org/changeset/base/221877
 
 Log:
   Restore BOOT2CFG, accidentally removed in r212938.
   
   PR:		157020
 
 Modified:
   head/tools/tools/nanobsd/nanobsd.sh
 
 Modified: head/tools/tools/nanobsd/nanobsd.sh
 ==============================================================================
 --- head/tools/tools/nanobsd/nanobsd.sh	Sat May 14 04:17:16 2011	(r221876)
 +++ head/tools/tools/nanobsd/nanobsd.sh	Sat May 14 04:32:30 2011	(r221877)
 @@ -660,7 +660,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
  )
  
  #######################################################################
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
