summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2006-05-03 16:28:15 +0000
committererdgeist <erdgeist@erdgeist.org>2006-05-03 16:28:15 +0000
commitfc9d97b45c1c1b7783cbf8bbc2d7f45e34babf29 (patch)
tree99aa57af308b4926208f81ea525474d3a565d696
parent96700dbb845dfae4facc52e361c36d32adc3e9b3 (diff)
Now honour new crypto image types
-rwxr-xr-xezjail.sh12
1 files 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()
63 eval ezjail_attachparams=\"\$jail_${ezjail}_attachparams\" 63 eval ezjail_attachparams=\"\$jail_${ezjail}_attachparams\"
64 64
65 # Cannot auto mount crypto jails without interrupting boot process 65 # Cannot auto mount crypto jails without interrupting boot process
66 [ "${ezjail_fromrc}" = "YES" -a "${ezjail_imagetype}" = "crypto" -a "${action}" = "start" ] && continue 66 if [ "${ezjail_fromrc}" = "YES" -a "${action}" = "start" ]; then
67 67 case "${ezjail_imagetype}" in crypto|eli|bde) continue;; esac
68 # Explicitely do only run crypto jails when *crypto is requested 68 fi
69 [ "${action%crypto}" != "${action}" -a "${ezjail_imagetype}" != "crypto" ] && continue 69
70 # Explicitely do only run crypto jails when *crypto is requested
71 if [ "${action%crypto}" != "${action}" ]; then
72 case "${ezjail_imagetype}" in crypto|eli|bde) ;; *) continue;; esac
73 fi
70 74
71 # Try to attach (crypto) devices 75 # Try to attach (crypto) devices
72 [ "${ezjail_image}" ] && attach_detach_pre 76 [ "${ezjail_image}" ] && attach_detach_pre