From owner-svn-src-all@FreeBSD.ORG  Sun Apr 28 21:44:45 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 518F8BF2;
 Sun, 28 Apr 2013 21:44:45 +0000 (UTC)
 (envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 42F3D163C;
 Sun, 28 Apr 2013 21:44:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3SLijfj084465;
 Sun, 28 Apr 2013 21:44:45 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3SLijb6084464;
 Sun, 28 Apr 2013 21:44:45 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <201304282144.r3SLijb6084464@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Sun, 28 Apr 2013 21:44:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250034 - head/tools/tools/nanobsd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Apr 2013 21:44:45 -0000

Author: n_hibma
Date: Sun Apr 28 21:44:44 2013
New Revision: 250034
URL: http://svnweb.freebsd.org/changeset/base/250034

Log:
  Doing a cpio from /var/empty if dir was not specified or non-existent
  copies its mode to the destination. This is not desirable.
  Rephrase this code to be more sensible.
  
  PR:		173483
  MFC after:	1 week

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

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Sun Apr 28 21:14:23 2013	(r250033)
+++ head/tools/tools/nanobsd/nanobsd.sh	Sun Apr 28 21:44:44 2013	(r250034)
@@ -413,12 +413,13 @@ populate_slice ( ) (
 	dir=$2
 	mnt=$3
 	lbl=$4
-	test -z $2 && dir=${NANO_WORLDDIR}/var/empty
-	test -d $dir || dir=${NANO_WORLDDIR}/var/empty
-	echo "Creating ${dev} with ${dir} (mounting on ${mnt})"
-	newfs_part $dev $mnt $lbl
-	cd ${dir}
-	find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt}
+	echo "Creating ${dev} (mounting on ${mnt})"
+	newfs_part ${dev} ${mnt} ${lbl}
+	if [ -n "${dir}" -a -d "${dir}" ]; then
+		echo "Populating ${lbl} from ${dir}"
+		cd ${dir}
+		find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt}
+	fi
 	df -i ${mnt}
 	umount ${mnt}
 )