svn commit: r269678 - user/jmmv/autotest/node

Garrett Cooper ngie at FreeBSD.org
Thu Aug 7 17:40:46 UTC 2014


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; }"


More information about the svn-src-user mailing list