From owner-svn-src-user@FreeBSD.ORG  Thu Aug  7 17:40:46 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CBD0DA1F
 for <svn-src-user@freebsd.org>; Thu,  7 Aug 2014 17:40:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A27BF2D32
 for <svn-src-user@freebsd.org>; Thu,  7 Aug 2014 17:40:46 +0000 (UTC)
Received: from ngie (uid 1347) (envelope-from ngie@FreeBSD.org) id 2786
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Thu, 07 Aug 2014 17:40:46 +0000
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 7 Aug 2014 17:40:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r269678 - user/jmmv/autotest/node
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e3ba1e.2786.4b35f606@svn.freebsd.org>
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Aug 2014 17:40:46 -0000

Author: ngie
Date: Thu Aug  7 17:40:46 2014
New Revision: 269678
URL: http://svnweb.freebsd.org/changeset/base/269678

Log:
  Remove chrootdir (DESTDIR) before running release.sh
  
  This will ensure that the next run has a clean install directory
  
  This should fix release.sh with the kyua.nyi.net post-r267679 and
  before r267842.
  
  Phabric: D556
  Reviewed by: jmmv
  Approved by: jmmv (mentor)
  Sponsored by: EMC / Isilon Storage Division

Modified:
  user/jmmv/autotest/node/iterate.sh

Modified: user/jmmv/autotest/node/iterate.sh
==============================================================================
--- user/jmmv/autotest/node/iterate.sh	Thu Aug  7 17:19:10 2014	(r269677)
+++ user/jmmv/autotest/node/iterate.sh	Thu Aug  7 17:40:46 2014	(r269678)
@@ -130,6 +130,13 @@ EOF
         || shtk_cli_error "Fetch of release.sh failed"
     chmod +x "${release_sh}"
 
+    local chrootdir="$(shtk_config_get CHROOTDIR)"
+
+    shtk_cli_info "Cleaning up ${chrootdir}"
+    rm -Rf "${chrootdir}"
+    chflags -R 0 "${chrootdir}"
+    rm -Rf "${chrootdir}"
+
     local ret=0
     shtk_process_run "${release_sh}" -c "${release_conf}" || ret=${?}
     rm -rf "${tmpdir}"; eval "remove_tmpdir() { true; }"