[gentoo-commits] proj/genkernel:master commit in: /, defaults/

["Sebastian Pipping" <sping@gentoo.org>]

commit:     8f8676adbd41e22b67174e14cc5f0dd45e7c2657
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Oct 31 21:55:15 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 21:55:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=8f8676ad

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

---
 ChangeLog               |    4 ++++
 defaults/initrd.scripts |    4 +++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 361d351..abdcbd5 100644
--- 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 d706c1a..89c6d8b 100755
--- 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
 }