From owner-svn-src-all@FreeBSD.ORG  Mon Mar 28 07:00:41 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 805B7106564A;
	Mon, 28 Mar 2011 07:00:41 +0000 (UTC) (envelope-from mr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 70F2E8FC1E;
	Mon, 28 Mar 2011 07:00:41 +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 p2S70f3F084252;
	Mon, 28 Mar 2011 07:00:41 GMT (envelope-from mr@svn.freebsd.org)
Received: (from mr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2S70fsr084250;
	Mon, 28 Mar 2011 07:00:41 GMT (envelope-from mr@svn.freebsd.org)
Message-Id: <201103280700.p2S70fsr084250@svn.freebsd.org>
From: Michael Reifenberger <mr@FreeBSD.org>
Date: Mon, 28 Mar 2011 07:00:41 +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: r220091 - head/tools/tools/nanobsd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 28 Mar 2011 07:00:41 -0000

Author: mr
Date: Mon Mar 28 07:00:41 2011
New Revision: 220091
URL: http://svn.freebsd.org/changeset/base/220091

Log:
  Use ${NANO_WORLDDIR}/var/empty as copy source since it has no schg flag set.
  Copying over /var/empty's schg flag had unpleasant side effects (schg flag on /etc and /cfg)
  during nanobsd boot before.

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

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Mon Mar 28 06:35:17 2011	(r220090)
+++ head/tools/tools/nanobsd/nanobsd.sh	Mon Mar 28 07:00:41 2011	(r220091)
@@ -413,8 +413,8 @@ populate_slice ( ) (
 	dir=$2
 	mnt=$3
 	lbl=$4
-	test -z $2 && dir=/var/empty
-	test -d $dir || dir=/var/empty
+	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}