X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;fp=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=afbca5a6d30a825ebf88baabc650e01ec5bb1c26;hb=c114e9f808d1379989b28a3e9405208aaa81b655;hp=a058acc21ae788a3e63dcfb309ee94d3ee26db78;hpb=f15f0b7fc24bfea874ae0f2fab5a62cfb0f0f631;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index a058acc..afbca5a 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -186,8 +186,7 @@ luks-setup() { # cryptsetup luksAddKey --pbkdf pbkdf2 # then remove the new format keys with cryptsetup luksRemoveKey # then cryptsetup convert DEV --type luks1, then readd old keys and remove temp. - yes YES | cryptsetup luksFormat $luksdev $luks_file \ - --type luks1 -c aes-cbc-essiv:sha256 -s 256 || [[ $? == 141 ]] + yes YES | cryptsetup luksFormat $luksdev $luks_file || [[ $? == 141 ]] yes "$lukspw" | \ cryptsetup luksAddKey --key-file $luks_file \ $luksdev || [[ $? == 141 ]]