From owner-svn-src-user@freebsd.org  Wed Sep  2 17:26:15 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 89E183DD81B
 for <svn-src-user@mailman.nyi.freebsd.org>;
 Wed,  2 Sep 2020 17:26:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BhW7W36Qlz3Y7Z;
 Wed,  2 Sep 2020 17:26:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ED52DD66;
 Wed,  2 Sep 2020 17:26:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082HQF3d074296;
 Wed, 2 Sep 2020 17:26:15 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082HQFhW074295;
 Wed, 2 Sep 2020 17:26:15 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <202009021726.082HQFhW074295@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 2 Sep 2020 17:26:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r365259 - user/gjb/thermite-git
X-SVN-Group: user
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: user/gjb/thermite-git
X-SVN-Commit-Revision: 365259
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Sep 2020 17:26:15 -0000

Author: gjb
Date: Wed Sep  2 17:26:14 2020
New Revision: 365259
URL: https://svnweb.freebsd.org/changeset/base/365259

Log:
  Re-sync with releng repo:
  - Add additional zfs datasets to destroy.
  - Call zfs_teardown() twice, as some datasets are created in non-intuitive
    ways.
  
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  user/gjb/thermite-git/zfs-cleanup.sh

Modified: user/gjb/thermite-git/zfs-cleanup.sh
==============================================================================
--- user/gjb/thermite-git/zfs-cleanup.sh	Wed Sep  2 16:29:40 2020	(r365258)
+++ user/gjb/thermite-git/zfs-cleanup.sh	Wed Sep  2 17:26:14 2020	(r365259)
@@ -93,11 +93,26 @@ zfs_teardown() {
 		done
 	done
 
-	zfs destroy ${zfs_parent}/${r}-amd64-worldseed-snap@clone
-	zfs destroy ${zfs_parent}/${r}-amd64-worldseed-snap
-	zfs destroy ${zfs_parent}/${r}-i386-worldseed-snap@clone
-	zfs destroy ${zfs_parent}/${r}-i386-worldseed-snap
+	# XXX
+	zfs destroy ${zfs_parent}/releng/scripts-${t}shot/chroots
+	zfs destroy ${zfs_parent}/releng/scripts-${t}shot
+	zfs destroy ${zfs_parent}/releng
+	zfs destroy ${zfs_parent}/${r}-ports-${t}@clone
+	zfs destroy ${zfs_parent}/${r}-src-${t}@clone
+	zfs destroy ${zfs_parent}/releng/scripts-${t}shot/chroots/${r}/amd64/snap
+	zfs destroy ${zfs_parent}/releng/scripts-${t}shot/chroots/${r}/amd64
+	zfs destroy ${zfs_parent}/releng/scripts-${t}shot/chroots/${r}
+	zfs destroy ${zfs_parent}/${r}-chroots-${t}
+	zfs destroy ${zfs_parent}/${r}-logs-${t}
+	zfs destroy ${zfs_parent}/${r}-ports-${t}
+	zfs destroy ${zfs_parent}/${r}-src-${t}
+	# XXX
 
+	zfs destroy ${zfs_parent}/${r}-amd64-worldseed-${t}@clone
+	zfs destroy ${zfs_parent}/${r}-amd64-worldseed-${t}
+	zfs destroy ${zfs_parent}/${r}-i386-worldseed-${t}@clone
+	zfs destroy ${zfs_parent}/${r}-i386-worldseed-${t}
+
 	echo -n "ZFS datasets were destroyed.  They will be created"
 	echo " automatically via thermite.sh."
 
@@ -144,6 +159,7 @@ main() {
 	pfx="==="
 
 	delete_only=1
+	zfs_teardown
 	zfs_teardown
 }