From afac3ed6c3bb221bbee6deb8bc76a1930e1e40ad Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 23 Jan 2018 16:41:31 +0000
Subject: [PATCH] When CHROOTBUILD_SKIP is set, evaluate the existence of
 /bin/sh within the CHROOTDIR.  If it does not exist, unset CHROOTBUILD_SKIP
 to prevent build failures.

Requested by:	swills
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
---
 release/release.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/release/release.sh b/release/release.sh
index d1afbf57011..da8fe2890b8 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -203,6 +203,11 @@ env_check() {
 		exit 1
 	fi
 
+	# Unset CHROOTBUILD_SKIP if the chroot(8) does not appear to exist.
+	if [ ! -z "${CHROOTBUILD_SKIP}" -a ! -e ${CHROOTDIR}/bin/sh ]; then
+		CHROOTBUILD_SKIP=
+	fi
+
 	CHROOT_MAKEENV="${CHROOT_MAKEENV} \
 		MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
 	CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"