[projects/geninitrd] Timeout here is not a good idea. rootfs cannot be mounted and kernel oopses due to that.

[arekm]

commit ad5033d7e704edaf52f2be18d4aa98c378179ede
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date:   Fri Jan 25 20:38:24 2019 +0100

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

 mod-luks.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mod-luks.sh b/mod-luks.sh
index ff877f7..ffe87cb 100644
--- 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
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/geninitrd.git/commitdiff/ad5033d7e704edaf52f2be18d4aa98c378179ede

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit