diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2006-03-25 17:57:50 +0000 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2006-03-25 17:57:50 +0000 |
| commit | db9c85aad02a7fdb1673be212871757e2b62d338 (patch) | |
| tree | b52adf53b673194fe3dd326622c3c03a7941560e /ezjail.sh | |
| parent | 57ee5da10b10bb8d9b0fff569b22045a1d3905ec (diff) | |
bug in startcrypto fixed
Diffstat (limited to 'ezjail.sh')
| -rwxr-xr-x | ezjail.sh | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -66,8 +66,8 @@ do_cmd() | |||
| 66 | # Cannot auto mount crypto jails without interrupting boot process | 66 | # Cannot auto mount crypto jails without interrupting boot process |
| 67 | [ "${ezjail_fromrc}" = "YES" -a "${ezjail_crypt}" = "YES" -a "${action}" = "start" ] && continue | 67 | [ "${ezjail_fromrc}" = "YES" -a "${ezjail_crypt}" = "YES" -a "${action}" = "start" ] && continue |
| 68 | 68 | ||
| 69 | # Explicitely do only run crypto jails | 69 | # Explicitely do only run crypto jails when *crypto is requested |
| 70 | [ "${action%crypto}" != "${action}" -a "${ezjail_crypt}" = "YES" ] && continue | 70 | [ "${action%crypto}" != "${action}" -a "${ezjail_crypt}" != "YES" ] && continue |
| 71 | 71 | ||
| 72 | # Try to attach (crypto) devices | 72 | # Try to attach (crypto) devices |
| 73 | [ "${ezjail_image}" ] && attach_detach_pre | 73 | [ "${ezjail_image}" ] && attach_detach_pre |
| @@ -84,7 +84,7 @@ do_cmd() | |||
| 84 | 84 | ||
| 85 | attach_detach_pre () | 85 | attach_detach_pre () |
| 86 | { | 86 | { |
| 87 | if [ "${action}" = start ]; then | 87 | if [ "${action%crypto}" = "start" ]; then |
| 88 | # If jail is running, do not mount devices, this is the same check as | 88 | # If jail is running, do not mount devices, this is the same check as |
| 89 | # /etc/rc.d/jail does | 89 | # /etc/rc.d/jail does |
| 90 | [ -e /var/run/jail_${ezjail}.id ] && return | 90 | [ -e /var/run/jail_${ezjail}.id ] && return |