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

- Fix a bug which prevented jails from starting when $jail_conf was used and

Browse Source 
no jail name was specified.
- Display error messages when start/stop fails.

Reported by:	swills
This commit is contained in:
Hiroki Sato 2013-10-18 03:44:16 +00:00
parent 6c3bcdf0de
commit d3b57253ee
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
etc/rc.d/jail
View File

@ -426,24 +426,26 @@ jail_start()
echo -n 'Starting jails:' echo -n 'Starting jails:'
case $1 in case $1 in
_ALL) _ALL)
echo -n ' '
command=$jail_program command=$jail_program
rc_flags=$jail_flags rc_flags=$jail_flags
command_args="-f $jail_conf -c" command_args="-f $jail_conf -c"
$jail_jls -nq | while read IN; do _tmp=`mktemp -t jail` || exit 3
_jn=$(echo $IN | tr " " "\n" | grep name=) if $command $rc_flags $command_args >> $_tmp 2>&1; then
_jid=$(echo $IN | tr " " "\n" | grep jid=) $jail_jls -nq | while read IN; do
if $command $rc_flags $command_args ${_jn#name=}; then _jn=$(echo $IN | tr " " "\n" | grep ^name=)
_jid=$(echo $IN | tr " " "\n" | grep ^jid=)
echo -n " ${_jn#name=}" echo -n " ${_jn#name=}"
echo "${_jid#jid=}" \ echo "${_jid#jid=}" \
> /var/run/jail_${_jn#name=}.id > /var/run/jail_${_jn#name=}.id
fi done
done else
tail -1 $_tmp
fi
rm -f $_tmp
echo '.' echo '.'
return return
;; ;;
esac esac
_tmp=`mktemp -t jail` || exit 3
for _j in $@; do for _j in $@; do
_j=$(echo $_j | tr /. _) _j=$(echo $_j | tr /. _)
parse_options $_j || continue parse_options $_j || continue
@ -455,10 +457,11 @@ jail_start()
else else
command_args="-i -f $_conf -c $_j" command_args="-i -f $_conf -c $_j"
fi fi
_tmp=`mktemp -t jail` || exit 3
if $command $rc_flags $command_args \ if $command $rc_flags $command_args \
>> $_tmp 2>&1 </dev/null; then >> $_tmp 2>&1 </dev/null; then
echo -n " ${_hostname:-${_j}}" echo -n " ${_hostname:-${_j}}"
_jid=$($jail_jls -n -j $_j | tr " " "\n" | grep jid=) _jid=$($jail_jls -n -j $_j | tr " " "\n" | grep ^jid=)
echo "${_jid#jid=}" > /var/run/jail_${_j}.id echo "${_jid#jid=}" > /var/run/jail_${_j}.id
else else
rm -f /var/run/jail_${_j}.id rm -f /var/run/jail_${_j}.id
@ -480,17 +483,21 @@ jail_stop()
echo -n 'Stopping jails:' echo -n 'Stopping jails:'
case $1 in case $1 in
_ALL) _ALL)
echo -n ' '
command=$jail_program command=$jail_program
rc_flags=$jail_flags rc_flags=$jail_flags
command_args="-f $jail_conf -r" command_args="-f $jail_conf -r"
$jail_jls -nq | while read IN; do $jail_jls -nq | while read IN; do
_jn=$(echo $IN | tr " " "\n" | grep name=) _jn=$(echo $IN | tr " " "\n" | grep ^name=)
echo -n " ${_jn#name=}" echo -n " ${_jn#name=}"
$command $rc_flags $command_args ${_jn#name=} _tmp=`mktemp -t jail` || exit 3
if ! $jail_jls -j ${_jn#name=} > /dev/null 2>&1; then $command $rc_flags $command_args ${_jn#name=} \
>> $_tmp 2>&1
if $jail_jls -j ${_jn#name=} > /dev/null 2>&1; then
tail -1 $_tmp
else
rm -f /var/run/jail_${_jn#name=}.id rm -f /var/run/jail_${_jn#name=}.id
fi fi
rm -f $_tmp
done done
echo '.' echo '.'
return return
@ -504,10 +511,14 @@ jail_stop()
fi fi
eval command=\${jail_${_j}_program:-$jail_program} eval command=\${jail_${_j}_program:-$jail_program}
echo -n " ${_hostname:-${_j}}" echo -n " ${_hostname:-${_j}}"
$command -q -f $_conf -r $_j _tmp=`mktemp -t jail` || exit 3
if ! $jail_jls -j $_j > /dev/null 2>&1; then $command -q -f $_conf -r $_j >> $_tmp 2>&1
if $jail_jls -j $_j > /dev/null 2>&1; then
tail -1 $_tmp
else
rm -f /var/run/jail_${_j}.id rm -f /var/run/jail_${_j}.id
fi fi
rm -f $_tmp
done done
echo '.' echo '.'
} }