From thomas@cuivre.fr.eu.org  Tue Aug 17 07:52:24 2010
Return-Path: <thomas@cuivre.fr.eu.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 138B81065697
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 Aug 2010 07:52:24 +0000 (UTC)
	(envelope-from thomas@cuivre.fr.eu.org)
Received: from melamine.cuivre.fr.eu.org (unknown [IPv6:2001:470:1f15:1531:224:e8ff:fe3d:60a5])
	by mx1.freebsd.org (Postfix) with ESMTP id CC0B58FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 Aug 2010 07:52:23 +0000 (UTC)
Received: by melamine.cuivre.fr.eu.org (Postfix, from userid 1000)
	id 1E9743137; Tue, 17 Aug 2010 09:52:23 +0200 (CEST)
Message-Id: <20100817075223.1E9743137@melamine.cuivre.fr.eu.org>
Date: Tue, 17 Aug 2010 09:52:23 +0200 (CEST)
From: Thomas Quinot <thomas@cuivre.fr.eu.org>
Reply-To: Thomas Quinot <thomas@cuivre.fr.eu.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] nanoBSD: support for NANO_DRIVE including a slash
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         149729
>Category:       misc
>Synopsis:       [nanobsd] [patch] nanoBSD: support for NANO_DRIVE including a slash
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 17 08:00:03 UTC 2010
>Closed-Date:    Thu Sep 02 23:27:59 MDT 2010
>Last-Modified:  Thu Sep 02 23:27:59 MDT 2010
>Originator:     Thomas Quinot
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD melamine.cuivre.fr.eu.org 8.0-STABLE FreeBSD 8.0-STABLE #0: Sun Mar 28 14:46:11 CEST 2010 thomas@melamine.cuivre.fr.eu.org:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	This minor change allows NANO_DRIVE to contain a /, which is useful
	if you want to use UFS labels (NANO_DRIVE=ufs/NANO, labeling
	the filesystems NANOs1a, NANOs2a, NANOs3, NANOs4).

>How-To-Repeat:
	
>Fix:

Index: nanobsd.sh
===================================================================
--- nanobsd.sh	(rvision 211410)
+++ nanobsd.sh	(copie de travail)
@@ -503,7 +503,7 @@
 		mount /dev/${MD}s2a ${MNT}
 		for f in ${MNT}/etc/fstab ${MNT}/conf/base/etc/fstab
 		do
-			sed -i "" "s/${NANO_DRIVE}s1/${NANO_DRIVE}s2/g" $f
+			sed -i "" "s#${NANO_DRIVE}s1#${NANO_DRIVE}s2#g" $f
 		done
 		umount ${MNT}
 	fi


>Release-Note:
>Audit-Trail:

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/149729: commit references a PR
Date: Fri,  3 Sep 2010 03:48:21 +0000 (UTC)

 Author: imp
 Date: Fri Sep  3 03:48:06 2010
 New Revision: 212169
 URL: http://svn.freebsd.org/changeset/base/212169
 
 Log:
   Allow / in the NANO_DEVICE
   
   PR:		149729
   Submitted by:	Thomas Quinot <thomas@cuivre.fr.eu.org>
 
 Modified:
   head/tools/tools/nanobsd/nanobsd.sh
 
 Modified: head/tools/tools/nanobsd/nanobsd.sh
 ==============================================================================
 --- head/tools/tools/nanobsd/nanobsd.sh	Fri Sep  3 03:20:34 2010	(r212168)
 +++ head/tools/tools/nanobsd/nanobsd.sh	Fri Sep  3 03:48:06 2010	(r212169)
 @@ -503,7 +503,7 @@ create_i386_diskimage ( ) (
  		mount /dev/${MD}s2a ${MNT}
  		for f in ${MNT}/etc/fstab ${MNT}/conf/base/etc/fstab
  		do
 -			sed -i "" "s/${NANO_DRIVE}s1/${NANO_DRIVE}s2/g" $f
 +			sed -i "" "s=${NANO_DRIVE}s1=${NANO_DRIVE}s2=g" $f
  		done
  		umount ${MNT}
  	fi
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: imp 
State-Changed-When: Thu Sep 2 23:27:32 MDT 2010 
State-Changed-Why:  
done 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149729 
>Unformatted:
