svn commit: r365261 - user/gjb/thermite-git

[Glen Barber]

Author: gjb
Date: Wed Sep  2 17:31:06 2020
New Revision: 365261
URL: https://svnweb.freebsd.org/changeset/base/365261

Log:
  Re-sync thermite.sh with releng repo:
  
  Fix two issues that crept in during debugging
  - Create the zfs snapshot for the clone before cloning the src
    tree.
  - In zfs_create_tree(), return 0 if the tree is 'src', since the
    tree exists as result of checking out to the ../release area.
  
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

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

Modified: user/gjb/thermite-git/thermite.sh
==============================================================================
--- user/gjb/thermite-git/thermite.sh	Wed Sep  2 17:28:19 2020	(r365260)
+++ user/gjb/thermite-git/thermite.sh	Wed Sep  2 17:31:06 2020	(r365261)
@@ -176,6 +176,7 @@ zfs_mount_src() {
 	_seedmount=${chroots}/${rev}/${arch}/${type}
 	_seedtarget="${zfs_parent}/${rev}-${arch}-${type}-chroot"
 	info "Creating ${_seedtarget} from ${_clone}"
+	zfs snapshot ${_clone}@clone
 	zfs clone -p -o atime=off -o mountpoint=${_seedmount} \
 		${_clone}@clone ${_seedtarget}
 	unset _clone _mount _target _tree _seedmount _seedtarget
@@ -188,7 +189,7 @@ zfs_create_tree() {
 	[ ! -z $(eval echo \${zfs_${_tree}_seed_${rev}_${type}}) ] && return 0
 	case ${_tree} in
 		src)
-			_gitsrc="${GITROOT}/${GITSRC}"
+			return 0
 			;;
 		doc)
 			[ ! -z ${NODOC} ] && return 0