--- encrypt.old 2007-01-28 14:06:46.000000000 +0100 +++ encrypt 2007-01-28 14:08:57.000000000 +0100 @@ -14,7 +14,7 @@ # Get keyfile if specified ckeyfile="/crypto_keyfile.bin" if [ "x${cryptkey}" != "x" ]; then - set -- $(/bin/replace "${cryptkey}" ':'); ckdev=$1; ckarg1=$2; ckarg2=$3 + set -- $(/bin/replace "${cryptkey}" ','); ckdev=$1; ckarg1=$2; ckarg2=$3 try=10 echo "Waiting for ${ckdev} ..." while [ ! -b ${ckdev} -a ${try} -gt 0 ]; do @@ -71,7 +71,7 @@ do_oldcrypto () { if [ $# -ne 5 ]; then - err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Verify parameter format: crypto=hash,cipher,keysize,offset,skip" err "Non-LUKS decryption not attempted..." return 1 fi @@ -92,11 +92,11 @@ } msg "Non-LUKS encrypted device found..." - do_oldcrypto $(/bin/replace -q "${crypto}" ':') + do_oldcrypto $(/bin/replace -q "${crypto}" ',') if [ $? -ne 0 ]; then err "Non-LUKS device decryption failed. verify format: " - err " crypto=hash:cipher:keysize:offset:skip" + err " crypto=hash,cipher,keysize,offset,skip" exit 1 fi if [ -e "/dev/mapper/root" ]; then