Date: Sat, 22 Nov 2014 20:55:21 +0000 (UTC) From: Nick Hibma <n_hibma@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r274892 - stable/10/tools/tools/nanobsd Message-ID: <201411222055.sAMKtLYg095309@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: n_hibma Date: Sat Nov 22 20:55:21 2014 New Revision: 274892 URL: https://svnweb.freebsd.org/changeset/base/274892 Log: MFC: ------------------------------------------------------------------------ r274792 | n_hibma | 2014-11-21 15:53:42 +0100 (Fri, 21 Nov 2014) | 5 lines 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: stable/10/tools/tools/nanobsd/nanobsd.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/tools/nanobsd/nanobsd.sh ============================================================================== --- stable/10/tools/tools/nanobsd/nanobsd.sh Sat Nov 22 20:48:21 2014 (r274891) +++ stable/10/tools/tools/nanobsd/nanobsd.sh Sat Nov 22 20:55:21 2014 (r274892) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411222055.sAMKtLYg095309>