diff options
author | feld <feld@FreeBSD.org> | 2016-02-10 16:13:59 +0000 |
---|---|---|
committer | feld <feld@FreeBSD.org> | 2016-02-10 16:13:59 +0000 |
commit | 543e5708630fa79fbb522858c45e6a0bbbda3c03 (patch) | |
tree | 67f8b9162cfb9df87794646ca7ae271b5e26dc38 /etc/rc.d | |
parent | 1e16bdfe118d1187781a4cf39af223b2c85f596c (diff) | |
download | FreeBSD-src-543e5708630fa79fbb522858c45e6a0bbbda3c03.zip FreeBSD-src-543e5708630fa79fbb522858c45e6a0bbbda3c03.tar.gz |
Add new rc.conf parameter "jail_reverse_stop"
When a user defines "jail_list" in rc.conf the jails are started in the
order defined. Currently the jails are not are stopped in reverse order
which may break dependencies between jails/services and prevent a clean
shutdown. The new parameter "jail_reverse_stop" will shutdown jails in
"jail_list" in reverse order when set to "YES".
Please note that this does not affect manual invocation of the jail rc
script. If a user runs the command
# service jail stop jail1 jail2 jail3
the jails will be stopped in exactly the order specified regardless of
jail_reverse_stop being defined in rc.conf.
PR: 196152
Approved by: jamie
MFC after: 1 week
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D5233
Diffstat (limited to 'etc/rc.d')
-rwxr-xr-x | etc/rc.d/jail | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/etc/rc.d/jail b/etc/rc.d/jail index b33f1b9..2d48989 100755 --- a/etc/rc.d/jail +++ b/etc/rc.d/jail @@ -521,7 +521,11 @@ jail_stop() command=$jail_program rc_flags=$jail_flags command_args="-f $jail_conf -r" - $jail_jls name | while read _j; do + if checkyesno jail_reverse_stop; then + $jail_jls name | tail -r + else + $jail_jls name + fi | while read _j; do echo -n " $_j" _tmp=`mktemp -t jail` || exit 3 $command $rc_flags $command_args $_j >> $_tmp 2>&1 @@ -536,6 +540,7 @@ jail_stop() return ;; esac + checkyesno jail_reverse_stop && set -- $(reverse_list $@) for _j in $@; do _j=$(echo $_j | tr /. _) _jv=$(echo -n $_j | tr -c '[:alnum:]' _) @@ -571,5 +576,6 @@ jail_warn() load_rc_config $name case $# in 1) run_rc_command $@ ${jail_list:-_ALL} ;; -*) run_rc_command $@ ;; +*) jail_reverse_stop="no" + run_rc_command $@ ;; esac |