Author: n_hibma
Date: Fri Nov 21 14:53:42 2014
New Revision: 274792
URL: https://svnweb.freebsd.org/changeset/base/274792

Log:
  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.

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

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh Fri Nov 21 12:35:18 2014        
(r274791)
+++ head/tools/tools/nanobsd/nanobsd.sh Fri Nov 21 14:53:42 2014        
(r274792)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to