From owner-svn-src-head@FreeBSD.ORG  Wed Sep 22 04:48:40 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F71B1065672;
	Wed, 22 Sep 2010 04:48:40 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F32B28FC19;
	Wed, 22 Sep 2010 04:48:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8M4mdxn016740;
	Wed, 22 Sep 2010 04:48:39 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8M4mdXs016738;
	Wed, 22 Sep 2010 04:48:39 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201009220448.o8M4mdXs016738@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 22 Sep 2010 04:48:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212990 - head/tools/tools/nanobsd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Sep 2010 04:48:40 -0000

Author: imp
Date: Wed Sep 22 04:48:39 2010
New Revision: 212990
URL: http://svn.freebsd.org/changeset/base/212990

Log:
  Make the labels match the device name that's mounted, not just the
  slice they are on.  When NANO_LABEL is not defined, the fstab
  generates entries that specify /dev/ad0s1a.  When NANO_LABEL is
  defined, it generates /dev/usb/${NANO_LABEL}s1a.  The prior code
  created the file system with a label of ${NANO_LABEL}s1, leading to
  problems on boot.
  
  Pointy hat to: imp@

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Wed Sep 22 02:26:07 2010	(r212989)
+++ head/tools/tools/nanobsd/nanobsd.sh	Wed Sep 22 04:48:39 2010	(r212990)
@@ -501,7 +501,7 @@ create_i386_diskimage ( ) (
 	bsdlabel ${MD}s1
 
 	# Create first image
-	populate_slice /dev/${MD}s1a ${NANO_WORLDDIR} ${MNT} "s1"
+	populate_slice /dev/${MD}s1a ${NANO_WORLDDIR} ${MNT} "s1a"
 	mount /dev/${MD}s1a ${MNT}
 	echo "Generating mtree..."
 	( cd ${MNT} && mtree -c ) > ${NANO_OBJ}/_.mtree
@@ -518,8 +518,10 @@ create_i386_diskimage ( ) (
 			sed -i "" "s=${NANO_DRIVE}s1=${NANO_DRIVE}s2=g" $f
 		done
 		umount ${MNT}
+		# Override the label from the first partition so we
+		# don't confuse glabel with duplicates.
 		if [ ! -z ${NANO_LABEL} ]; then
-			tunefs -L ${NANO_LABEL}"s2" /dev/${MD}s2a
+			tunefs -L ${NANO_LABEL}"s2a" /dev/${MD}s2a
 		fi
 	fi