bug in startcrypto fixed
This commit is contained in:
parent
57ee5da10b
commit
db9c85aad0
@ -66,8 +66,8 @@ do_cmd()
|
|||||||
# Cannot auto mount crypto jails without interrupting boot process
|
# Cannot auto mount crypto jails without interrupting boot process
|
||||||
[ "${ezjail_fromrc}" = "YES" -a "${ezjail_crypt}" = "YES" -a "${action}" = "start" ] && continue
|
[ "${ezjail_fromrc}" = "YES" -a "${ezjail_crypt}" = "YES" -a "${action}" = "start" ] && continue
|
||||||
|
|
||||||
# Explicitely do only run crypto jails
|
# Explicitely do only run crypto jails when *crypto is requested
|
||||||
[ "${action%crypto}" != "${action}" -a "${ezjail_crypt}" = "YES" ] && continue
|
[ "${action%crypto}" != "${action}" -a "${ezjail_crypt}" != "YES" ] && continue
|
||||||
|
|
||||||
# Try to attach (crypto) devices
|
# Try to attach (crypto) devices
|
||||||
[ "${ezjail_image}" ] && attach_detach_pre
|
[ "${ezjail_image}" ] && attach_detach_pre
|
||||||
@ -84,7 +84,7 @@ do_cmd()
|
|||||||
|
|
||||||
attach_detach_pre ()
|
attach_detach_pre ()
|
||||||
{
|
{
|
||||||
if [ "${action}" = start ]; then
|
if [ "${action%crypto}" = "start" ]; then
|
||||||
# If jail is running, do not mount devices, this is the same check as
|
# If jail is running, do not mount devices, this is the same check as
|
||||||
# /etc/rc.d/jail does
|
# /etc/rc.d/jail does
|
||||||
[ -e /var/run/jail_${ezjail}.id ] && return
|
[ -e /var/run/jail_${ezjail}.id ] && return
|
||||||
|
Loading…
x
Reference in New Issue
Block a user