Merge pull request #509 from egypcio/egypcio

jail -u: Verify TORELEASE before performing jail upgrade.

src/share/poudriere/jail.sh

@@ -198,6 +198,17 @@ update_jail() {
 	msg "Upgrading using ${METHOD}"
 	case ${METHOD} in
 	ftp|http|ftp-archive)
+		# In case we use FreeBSD dists and TORELEASE is present, check if it's a release branch.
+		if [ -n "${TORELEASE}" ]; then
+		  case ${TORELEASE} in
+		    *-ALPHA*|*-CURRENT|*-PRERELEASE|*-STABLE)
+			msg_error "Only release branches are supported by the ${METHOD} method."
+			msg_error "Please try to upgrade to a new BETA, RC or RELEASE version."
+			exit 1
+			;;
+		    *) ;;
+		  esac
+		fi
 		MASTERMNT=${JAILMNT}
 		MASTERNAME=${JAILNAME}-${PTNAME}${SETNAME:+-${SETNAME}}
 		[ -n "${RESOLV_CONF}" ] && cp -v "${RESOLV_CONF}" "${JAILMNT}/etc/"
@@ -828,7 +839,7 @@ create_jail() {
 
 	markfs clean ${JAILMNT}
 
-	# Check VERSION before running 'update_jail' on FreeBSD dists.
+	# Check VERSION before running 'update_jail' on jails created using FreeBSD dists.
 	case ${METHOD} in
 		ftp|http|ftp-archive)
 			[ ${VERSION#*-RELEAS*} != ${VERSION} ] && update_jail