summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authormr <mr@FreeBSD.org>2011-03-28 07:00:41 +0000
committermr <mr@FreeBSD.org>2011-03-28 07:00:41 +0000
commitb45e1276537c535d97a91312843f97c3e37794b4 (patch)
treee65085740515f805c231e0c3c1eeb5551afec977 /tools
parentb3ffae779b5756d0990126a19585b3fb90960ae2 (diff)
downloadFreeBSD-src-b45e1276537c535d97a91312843f97c3e37794b4.zip
FreeBSD-src-b45e1276537c535d97a91312843f97c3e37794b4.tar.gz
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.
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/nanobsd/nanobsd.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 1666144..8078d11 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -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}
OpenPOWER on IntegriCloud