View | Details | Raw Unified | Return to bug 216469 | Differences between
and this patch

Collapse All | Expand All

(-)/home/dereks/ezjail.orig (-3 / +3 lines)
Lines 26-32 Link Here
26
26
27
ezjail_enable=${ezjail_enable:-"NO"}
27
ezjail_enable=${ezjail_enable:-"NO"}
28
28
29
restart_cmd="do_cmd stop _; do_cmd start _;";
29
restart_cmd="do_cmd restart _"
30
start_cmd="do_cmd start '_ ezjail'"
30
start_cmd="do_cmd start '_ ezjail'"
31
stop_cmd="do_cmd stop '_ ezjail'"
31
stop_cmd="do_cmd stop '_ ezjail'"
32
startcrypto_cmd="do_cmd startcrypto _"
32
startcrypto_cmd="do_cmd startcrypto _"
Lines 104-110 Link Here
104
  [ "${ezjail_pass}" ] && sh /etc/rc.d/jail one${action%crypto} ${ezjail_pass}
104
  [ "${ezjail_pass}" ] && sh /etc/rc.d/jail one${action%crypto} ${ezjail_pass}
105
105
106
  # Configure settings that need to be done after the jail has been started
106
  # Configure settings that need to be done after the jail has been started
107
  if [ "${action%crypto}" = "start" ]; then
107
  if [ "${action%crypto}" = "start" -o "${action}" = "restart" ]; then
108
    for ezjail in ${ezjail_pass}; do
108
    for ezjail in ${ezjail_pass}; do
109
      ezjail_safename=`echo -n "${ezjail}" | tr -c '[:alnum:]' _`
109
      ezjail_safename=`echo -n "${ezjail}" | tr -c '[:alnum:]' _`
110
      # Get the JID of the jail
110
      # Get the JID of the jail
Lines 134-140 Link Here
134
attach_detach_pre ()
134
attach_detach_pre ()
135
{
135
{
136
  case "${action%crypto}" in
136
  case "${action%crypto}" in
137
  start)
137
  start|restart)
138
    # If jail is running, do not mount devices, this is the same check as
138
    # If jail is running, do not mount devices, this is the same check as
139
    # /etc/rc.d/jail does
139
    # /etc/rc.d/jail does
140
    [ -e "/var/run/jail_${ezjail}.id" ] && return 0
140
    [ -e "/var/run/jail_${ezjail}.id" ] && return 0

Return to bug 216469