From owner-svn-src-stable-10@FreeBSD.ORG Sat Nov 22 20:55:21 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3F7C69C; Sat, 22 Nov 2014 20:55:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFB5422B; Sat, 22 Nov 2014 20:55:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMKtLxn095310; Sat, 22 Nov 2014 20:55:21 GMT (envelope-from n_hibma@FreeBSD.org) Received: (from n_hibma@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMKtLYg095309; Sat, 22 Nov 2014 20:55:21 GMT (envelope-from n_hibma@FreeBSD.org) Message-Id: <201411222055.sAMKtLYg095309@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: n_hibma set sender to n_hibma@FreeBSD.org using -f From: Nick Hibma Date: Sat, 22 Nov 2014 20:55:21 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 20:55:21 -0000 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