diff options
| author | root <root@rshg054.dnsready.net> | 2013-02-13 00:04:32 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-02-13 00:04:32 -0800 |
| commit | 0671250710c3e7312a4693ac45ebbaacf471d1dc (patch) | |
| tree | f40a26f2fd5267582cf25a84886471773bc160c8 /core/cryptsetup/encrypt_hook | |
| parent | 29b0da64a462b6c5f6871b08e344b3ffa59cbd0a (diff) | |
Wed Feb 13 00:04:27 PST 2013
Diffstat (limited to 'core/cryptsetup/encrypt_hook')
| -rw-r--r-- | core/cryptsetup/encrypt_hook | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook index 11db3443a..819c4cf60 100644 --- a/core/cryptsetup/encrypt_hook +++ b/core/cryptsetup/encrypt_hook @@ -66,7 +66,7 @@ EOF dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then - if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then + if eval cryptsetup --key-file ${ckeyfile} open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -78,7 +78,7 @@ EOF echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password - while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do + while ! eval cryptsetup open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -98,7 +98,7 @@ EOF err "Non-LUKS decryption not attempted..." return 1 fi - exe="cryptsetup create $cryptname $resolved $cryptargs" + exe="cryptsetup open --type plain $resolved $cryptname $cryptargs" IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF $crypto EOF |