From 106efceff3c8d4bfb0729470b662afab7509dfe7 Mon Sep 17 00:00:00 2001
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Thu, 14 Jul 2016 20:17:08 +0000
Subject: [PATCH] Start jails non-parallel if jail_parallel_start is NO.  This
 was true for an explicitly specified jail list; now it's also true for all
 jails.

PR:		209112
MFC after:	3 days
---
 etc/rc.d/jail | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index f5b045b3d513..51ecf77eb9cc 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -451,6 +451,9 @@ jail_start()
 		command=$jail_program
 		rc_flags=$jail_flags
 		command_args="-f $jail_conf -c"
+		if ! checkyesno jail_parallel_start; then
+			command_args="$command_args -p1"
+		fi
 		_tmp=`mktemp -t jail` || exit 3
 		if $command $rc_flags $command_args >> $_tmp 2>&1; then
 			$jail_jls jid name | while read _id _name; do
@@ -458,7 +461,7 @@ jail_start()
 				echo $_id > /var/run/jail_${_name}.id
 			done
 		else
-			tail -1 $_tmp
+			cat $_tmp
 		fi
 		rm -f $_tmp
 		echo '.'
@@ -545,7 +548,7 @@ jail_stop()
 			_tmp=`mktemp -t jail` || exit 3
 			$command $rc_flags $command_args $_j >> $_tmp 2>&1
 			if $jail_jls -j $_j > /dev/null 2>&1; then
-				tail -1 $_tmp
+				cat $_tmp
 			else
 				rm -f /var/run/jail_${_j}.id
 			fi
@@ -568,7 +571,7 @@ jail_stop()
 		_tmp=`mktemp -t jail` || exit 3
 		$command -q -f $_conf -r $_j >> $_tmp 2>&1
 		if $jail_jls -j $_j > /dev/null 2>&1; then
-			tail -1 $_tmp
+			cat $_tmp
 		else
 			rm -f /var/run/jail_${_j}.id
 		fi