Timeout here is not a good idea. rootfs cannot be mounted and kernel oopses due to...

[projects/geninitrd.git] / mod-luks.sh

diff --git a/mod-luks.sh b/mod-luks.sh
index ff877f779c21e269061fd55658ab70c4a4cf5ee5..ffe87cb46529bf1e355f05a9044ece94089eb13e 100644 (file)
--- a/mod-luks.sh
+++ b/mod-luks.sh
@@ -162,7 +162,7 @@ luks_crypttab() {
                        done
                        IFS="$old_IFS"
 
-                       verbose "+ cryptsetup --timeout=120 ${keyfile:+-d $keyfile} open $crypttab_opt '$src' '$dst'"
+                       verbose "+ cryptsetup ${keyfile:+-d $keyfile} open $crypttab_opt '$src' '$dst'"
                        add_linuxrc <<-EOF
                        debugshell
 
@@ -189,7 +189,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 $crypttab_opt "\$luksdev" '$dst' <&1
+                                       cryptsetup \$cryptsetup_opt ${keyfile:+-d $keyfile} open $crypttab_opt "\$luksdev" '$dst' <&1
                                fi
                        fi