diff options
author | erdgeist <erdgeist@erdgeist.org> | 2006-05-07 22:25:25 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2006-05-07 22:25:25 +0000 |
commit | 56f79ffcec367af0269b5ac646136f76d1405252 (patch) | |
tree | ddb7e1f392a3cc125cff21fa0c6e238e5ece6077 /ezjail.sh | |
parent | 48a4ad0891b43b296853f550f4560d05ca123f47 (diff) |
Add a forceful blocking option to ezjail creation
Diffstat (limited to 'ezjail.sh')
-rwxr-xr-x | ezjail.sh | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -63,12 +63,15 @@ do_cmd() | |||
63 | eval ezjail_imagetype=\"\$jail_${ezjail}_imagetype\" | 63 | eval ezjail_imagetype=\"\$jail_${ezjail}_imagetype\" |
64 | eval ezjail_attachparams=\"\$jail_${ezjail}_attachparams\" | 64 | eval ezjail_attachparams=\"\$jail_${ezjail}_attachparams\" |
65 | eval ezjail_attachblocking=\"\$jail_${ezjail}_attachblocking\" | 65 | eval ezjail_attachblocking=\"\$jail_${ezjail}_attachblocking\" |
66 | eval ezjail_forceblocking=\"\$jail_${ezjail}_forceblocking\" | ||
66 | 67 | ||
67 | # Cannot auto mount blocking crypto jails without interrupting boot process | 68 | [ ${ezjail_attachblocking} = "YES" -o ${ezjail_forceblocking} = "YES" ] && ezjail_blocking="YES" || unset ezjail_blocking |
68 | [ "${ezjail_fromrc}" = "YES" -a "${action}" = "start" -a "${ezjail_attachblocking}" = "YES" ] && continue | 69 | |
70 | # Cannot auto mount blocking jails without interrupting boot process | ||
71 | [ "${ezjail_fromrc}" = "YES" -a "${action}" = "start" -a "${ezjail_blocking}" = "YES" ] && continue | ||
69 | 72 | ||
70 | # Explicitely do only run blocking crypto jails when *crypto is requested | 73 | # Explicitely do only run blocking crypto jails when *crypto is requested |
71 | [ "${action%crypto}" != "${action}" -a -z "${ezjail_attachblocking}" ] && continue | 74 | [ "${action%crypto}" != "${action}" -a -z "${ezjail_blocking}" ] && continue |
72 | 75 | ||
73 | # Try to attach (crypto) devices | 76 | # Try to attach (crypto) devices |
74 | [ -n "${ezjail_image}" ] && attach_detach_pre | 77 | [ -n "${ezjail_image}" ] && attach_detach_pre |