d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start jails non-parallel if jail_parallel_start is NO. This was true

Browse Source 
for an explicitly specified jail list; now it's also true for all jails.

PR:		209112
MFC after:	3 days
This commit is contained in:
Jamie Gritton 2016-07-14 20:17:08 +00:00
parent 4c86c0fa98
commit 106efceff3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/rc.d/jail
View File

@ -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