Fix return value of crypt_filter() which caused bogus LUKS opening errors (bug #383545)

diff --git a/ChangeLog b/ChangeLog
index 361d35139215248b3264a9f093cd604605da9980..abdcbd500d7621ac54804928391e464d37ddc1df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  31 Oct 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  Fix return value of crypt_filter() which caused bogus LUKS opening errors
+  (bug #383545)
+
   30 Oct 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.19
 

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d706c1a728b7f8761c353711671810f3eb8d8078..89c6d8bf6bc6e00a890161b539179d241e60a7f0 100755 (executable)
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -356,10 +356,12 @@ crypt_filter() {
        else
                splash 'verbose' > /dev/null &
                eval $1
-               if [ $? -eq 0 ]
+               res=$?
+               if [ ${res} -eq 0 ]
                then
                        splash set_msg 'Disk unlocked.'
                fi
+               return ${res}
        fi
 }