Attachment 179319 Details for Bug 216469 – do_cmd stop/start when restarting instead of do_cmd restart

[patch] do_cmd stop/start when restarting instead of do_cmd restart

ezjail-restart.patch (text/plain), 1.05 KB, created by Derek Schrock on 2017-01-25 23:16:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2017-01-25 23:16:13 UTC

Size: 1.05 KB

patch

obsolete

>--- /usr/local/etc/rc.d/ezjail	2017-01-25 18:06:56.921304000 -0500
>+++ /home/dereks/ezjail.orig	2017-01-25 18:00:02.563424000 -0500
>@@ -26,7 +26,7 @@
> 
> ezjail_enable=${ezjail_enable:-"NO"}
> 
>-restart_cmd="do_cmd stop _; do_cmd start _;";
>+restart_cmd="do_cmd restart _"
> start_cmd="do_cmd start '_ ezjail'"
> stop_cmd="do_cmd stop '_ ezjail'"
> startcrypto_cmd="do_cmd startcrypto _"
>@@ -104,7 +104,7 @@
>   [ "${ezjail_pass}" ] && sh /etc/rc.d/jail one${action%crypto} ${ezjail_pass}
> 
>   # Configure settings that need to be done after the jail has been started
>-  if [ "${action%crypto}" = "start" ]; then
>+  if [ "${action%crypto}" = "start" -o "${action}" = "restart" ]; then
>     for ezjail in ${ezjail_pass}; do
>       ezjail_safename=`echo -n "${ezjail}" | tr -c '[:alnum:]' _`
>       # Get the JID of the jail
>@@ -134,7 +134,7 @@
> attach_detach_pre ()
> {
>   case "${action%crypto}" in
>-  start)
>+  start|restart)
>     # If jail is running, do not mount devices, this is the same check as
>     # /etc/rc.d/jail does
>     [ -e "/var/run/jail_${ezjail}.id" ] && return 0

Actions: View | Diff

Attachments on bug 216469: 179319 | 179329