Date: Wed, 2 Sep 2020 17:26:15 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365259 - user/gjb/thermite-git Message-ID: <202009021726.082HQFhW074295@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009021726.082HQFhW074295>