svn commit: r220091 - head/tools/tools/nanobsd

[Michael Reifenberger]

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}