Author: jamie
Date: Sun Jul 17 14:07:51 2016
New Revision: 302955
URL: https://svnweb.freebsd.org/changeset/base/302955
Log:
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
Approved by: re (gjb)
Modified:
stable/11/etc/rc.d/jail
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/etc/rc.d/jail
==============================================================================
--- stable/11/etc/rc.d/jail Sun Jul 17 14:06:17 2016 (r302954)
+++ stable/11/etc/rc.d/jail Sun Jul 17 14:07:51 2016 (r302955)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
