diff options
-rwxr-xr-x | ezjail-admin | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ezjail-admin b/ezjail-admin index 49ddee3..2a530b0 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -255,7 +255,7 @@ create) | |||
255 | case "${ezjail_imagetype}" in | 255 | case "${ezjail_imagetype}" in |
256 | bde|eli) | 256 | bde|eli) |
257 | # parse imageparams, generate attachparams | 257 | # parse imageparams, generate attachparams |
258 | ezjail_attachblocking="YES" | 258 | [ -n "${ezjail_passphraseurl}" ] || ezjail_attachblocking="YES" |
259 | if [ -n "${ezjail_imageparams}" ]; then | 259 | if [ -n "${ezjail_imageparams}" ]; then |
260 | ezjail_attachparams=`echo $0 _parse_g${ezjail_imagetype}_attach_args_ ${ezjail_imageparams} | /bin/sh ` | 260 | ezjail_attachparams=`echo $0 _parse_g${ezjail_imagetype}_attach_args_ ${ezjail_imageparams} | /bin/sh ` |
261 | [ 5 -eq $? ] && exerr "processing of ezjail_imageparams failed" | 261 | [ 5 -eq $? ] && exerr "processing of ezjail_imageparams failed" |
@@ -268,13 +268,12 @@ create) | |||
268 | attach_cmd="geli attach ${ezjail_attachparams} /dev/${ezjail_imagedevice}";; | 268 | attach_cmd="geli attach ${ezjail_attachparams} /dev/${ezjail_imagedevice}";; |
269 | esac | 269 | esac |
270 | [ -n "${ezjail_attachblocking}" ] && echo "Initialising crypto device. Enter a new passphrase twice... " | 270 | [ -n "${ezjail_attachblocking}" ] && echo "Initialising crypto device. Enter a new passphrase twice... " |
271 | |||
272 | ( echo ${init_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not initialise crypto image." | 271 | ( echo ${init_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not initialise crypto image." |
273 | 272 | ||
274 | [ -n "${ezjail_attachblocking}" ] && echo "Attaching crypto device. Enter the passphrase... " | 273 | [ -n "${ezjail_attachblocking}" ] && echo "Attaching crypto device. Enter the passphrase... " |
275 | ( echo ${attach_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not attach crypto image." | 274 | ( echo ${attach_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not attach crypto image." |
276 | ezjail_device=${ezjail_imagedevice}.${ezjail_imagetype} | 275 | ezjail_device=${ezjail_imagedevice}.${ezjail_imagetype} |
277 | ;; | 276 | ;; |
278 | simple) | 277 | simple) |
279 | ezjail_device=${ezjail_imagedevice} | 278 | ezjail_device=${ezjail_imagedevice} |
280 | ;; | 279 | ;; |