From c0d01502099853570a1c09921ae8ad77d62bfddc Mon Sep 17 00:00:00 2001
From: jamie <jamie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 17 Jul 2016 14:16:21 +0000
Subject: [PATCH] MFC r302857:

  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


git-svn-id: svn://svn.freebsd.org/base/stable/10@302959 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 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 6e016f8ee..cd1171ccf 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -433,6 +433,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
@@ -440,7 +443,7 @@ jail_start()
 				echo $_id > /var/run/jail_${_name}.id
 			done
 		else
-			tail -1 $_tmp
+			cat $_tmp
 		fi
 		rm -f $_tmp
 		echo '.'
@@ -527,7 +530,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
@@ -550,7 +553,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
-- 
2.42.0