aboutsummaryrefslogtreecommitdiff
path: root/tools/tools/nanobsd/nanobsd.sh
diff options
context:
space:
mode:
authorNick Hibma <n_hibma@FreeBSD.org>2014-11-21 14:53:42 +0000
committerNick Hibma <n_hibma@FreeBSD.org>2014-11-21 14:53:42 +0000
commit40dd22f4fbd2f5040656251c42623c0198bcc9cf (patch)
tree0769c56b96f85ef25ea6a02d8bc623c8be653519 /tools/tools/nanobsd/nanobsd.sh
parente48bb73a2ae6267a5926e42346e05fcff9a4fae9 (diff)
downloadsrc-40dd22f4fbd2f5040656251c42623c0198bcc9cf.tar.gz
src-40dd22f4fbd2f5040656251c42623c0198bcc9cf.zip
Simply remove the tmp dir before creating the symlink. We are doing
chroots all over the place, so there is bound to be a stale file lying around in there (in my case samba lock files from creating accounts). If we don't do that, the symlink later will fail.
Notes
Notes: svn path=/head/; revision=274792
Diffstat (limited to 'tools/tools/nanobsd/nanobsd.sh')
-rw-r--r--tools/tools/nanobsd/nanobsd.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 437085aa5f2e..d70b56bf0153 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -421,7 +421,7 @@ setup_nanobsd ( ) (
echo "mount -o ro /dev/${NANO_DRIVE}s3" > conf/default/etc/remount
# Put /tmp on the /var ramdisk (could be symlink already)
- test -d tmp && rmdir tmp || nano_rm -f tmp
+ nano_rm -rf tmp
ln -s var/tmp tmp
) > ${NANO_OBJ}/_.dl 2>&1