commit 7d4fa91c4a63900ed829b088d2513a60ac764ddd
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Mon Aug 13 22:49:31 2018 +0200
Drop forced luks type as latest tools support luks2, too. Leave it for
cryptsetup autodetection.
mod-luks.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mod-luks.sh b/mod-luks.sh
index 8e9bc46..99ff4a6 100644
--- a/mod-luks.sh
+++ b/mod-luks.sh
@@ -157,7 +157,7 @@ luks_crypttab() {
done
IFS="$old_IFS"
- verbose "+ cryptsetup --timeout=120 ${keyfile:+-d
$keyfile} open --type luks $crypttab_opt '$src' '$dst'"
+ verbose "+ cryptsetup --timeout=120 ${keyfile:+-d
$keyfile} open $crypttab_opt '$src' '$dst'"
add_linuxrc <<-EOF
debugshell
@@ -184,7 +184,7 @@ luks_crypttab() {
crypt_status=\$(cryptsetup \$cryptsetup_opt
status '$dst')
if [ "\${crypt_status%%is inactive.}" !=
"\$crypt_status" ]; then
# is inactive
- cryptsetup \$cryptsetup_opt
${keyfile:+-d $keyfile} --timeout 120 open --type luks $crypttab_opt
"\$luksdev" '$dst' <&1
+ cryptsetup \$cryptsetup_opt
${keyfile:+-d $keyfile} --timeout 120 open $crypttab_opt "\$luksdev" '$dst' <&1
fi
fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/geninitrd.git/commitdiff/7d4fa91c4a63900ed829b088d2513a60ac764ddd
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
