From fc9d97b45c1c1b7783cbf8bbc2d7f45e34babf29 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Wed, 3 May 2006 16:28:15 +0000 Subject: Now honour new crypto image types --- ezjail.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ezjail.sh b/ezjail.sh index e461436..13625fe 100755 --- a/ezjail.sh +++ b/ezjail.sh @@ -63,10 +63,14 @@ do_cmd() eval ezjail_attachparams=\"\$jail_${ezjail}_attachparams\" # Cannot auto mount crypto jails without interrupting boot process - [ "${ezjail_fromrc}" = "YES" -a "${ezjail_imagetype}" = "crypto" -a "${action}" = "start" ] && continue - - # Explicitely do only run crypto jails when *crypto is requested - [ "${action%crypto}" != "${action}" -a "${ezjail_imagetype}" != "crypto" ] && continue + if [ "${ezjail_fromrc}" = "YES" -a "${action}" = "start" ]; then + case "${ezjail_imagetype}" in crypto|eli|bde) continue;; esac + fi + + # Explicitely do only run crypto jails when *crypto is requested + if [ "${action%crypto}" != "${action}" ]; then + case "${ezjail_imagetype}" in crypto|eli|bde) ;; *) continue;; esac + fi # Try to attach (crypto) devices [ "${ezjail_image}" ] && attach_detach_pre -- cgit v1.2.3