diff options
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-x | ezjail-admin | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/ezjail-admin b/ezjail-admin index d248126..775d7fb 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -376,34 +376,34 @@ create) | |||
376 | fi | 376 | fi |
377 | 377 | ||
378 | case ${ezjail_imagetype} in | 378 | case ${ezjail_imagetype} in |
379 | bde|eli) | 379 | bde|eli) |
380 | # parse imageparams, generate attachparams | 380 | # parse imageparams, generate attachparams |
381 | ezjail_attachblocking="YES" | 381 | ezjail_attachblocking="YES" |
382 | if [ "${ezjail_imageparams}" ]; then | 382 | if [ "${ezjail_imageparams}" ]; then |
383 | ezjail_attachparams=`echo $0 _parse_g${ezjail_imagetype}_attach_args_ ${ezjail_imageparams} | /bin/sh` | 383 | ezjail_attachparams=`echo $0 _parse_g${ezjail_imagetype}_attach_args_ ${ezjail_imageparams} | /bin/sh` |
384 | [ 5 -eq $? ] && exerr "processing of ezjail_imageparams failed" | 384 | [ 5 -eq $? ] && exerr "processing of ezjail_imageparams failed" |
385 | [ 3 -eq $? ] && unset ezjail_attachblocking | 385 | [ 3 -eq $? ] && unset ezjail_attachblocking |
386 | fi | 386 | fi |
387 | case ${ezjail_imagetype} in | 387 | case ${ezjail_imagetype} in |
388 | bde) init_cmd="gbde init /dev/${ezjail_imagedevice} ${ezjail_imageparams}" | 388 | bde) init_cmd="gbde init /dev/${ezjail_imagedevice} ${ezjail_imageparams}" |
389 | attach_cmd="gbde attach /dev/${ezjail_imagedevice} ${ezjail_attachparams}";; | 389 | attach_cmd="gbde attach /dev/${ezjail_imagedevice} ${ezjail_attachparams}";; |
390 | eli) init_cmd="geli init ${ezjail_imageparams} /dev/${ezjail_imagedevice}" | 390 | eli) init_cmd="geli init ${ezjail_imageparams} /dev/${ezjail_imagedevice}" |
391 | attach_cmd="geli attach ${ezjail_attachparams} /dev/${ezjail_imagedevice}";; | 391 | attach_cmd="geli attach ${ezjail_attachparams} /dev/${ezjail_imagedevice}";; |
392 | esac | 392 | esac |
393 | 393 | ||
394 | if [ -z "${ezjail_exists} ]; then | 394 | if [ -z "${ezjail_exists} ]; then |
395 | [ "${ezjail_attachblocking}" ] && echo "Initialising crypto device. You will be asked to enter a new passphrase twice... " | 395 | [ "${ezjail_attachblocking}" ] && echo "Initialising crypto device. You will be asked to enter a new passphrase twice... " |
396 | ( echo ${init_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not initialise crypto image." | 396 | ( echo ${init_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not initialise crypto image." |
397 | 397 | ||
398 | [ "${ezjail_attachblocking}" ] && echo "Attaching crypto device. You will be asked to enter the new passphrase... " | 398 | [ "${ezjail_attachblocking}" ] && echo "Attaching crypto device. You will be asked to enter the new passphrase... " |
399 | ( echo ${attach_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not attach crypto image." | 399 | ( echo ${attach_cmd} | /bin/sh ) || detach_images || exerr "Error: Could not attach crypto image." |
400 | fi | 400 | fi |
401 | 401 | ||
402 | ezjail_device="${ezjail_imagedevice}.${ezjail_imagetype}" | 402 | ezjail_device="${ezjail_imagedevice}.${ezjail_imagetype}" |
403 | ;; | 403 | ;; |
404 | simple) | 404 | simple) |
405 | ezjail_device=${ezjail_imagedevice} | 405 | ezjail_device=${ezjail_imagedevice} |
406 | ;; | 406 | ;; |
407 | esac | 407 | esac |
408 | 408 | ||
409 | if [ -z "${ezjail_exists} ]; then | 409 | if [ -z "${ezjail_exists} ]; then |