From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RNpMf-0005x7-89 for garchives@archives.gentoo.org; Tue, 08 Nov 2011 17:21:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61FEB21C02F; Tue, 8 Nov 2011 17:21:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 31F5E21C02F for ; Tue, 8 Nov 2011 17:21:28 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A73E21B403A for ; Tue, 8 Nov 2011 17:21:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B4BD880042 for ; Tue, 8 Nov 2011 17:21:26 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <8f8676adbd41e22b67174e14cc5f0dd45e7c2657.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog defaults/initrd.scripts X-VCS-Directories: / defaults/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 8f8676adbd41e22b67174e14cc5f0dd45e7c2657 Date: Tue, 8 Nov 2011 17:21:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c685b76d-8e3b-4507-b6b0-747b1b56c7af X-Archives-Hash: bbe04a8522f541a37600f1e55eaf8ae1 commit: 8f8676adbd41e22b67174e14cc5f0dd45e7c2657 Author: Sebastian Pipping pipping org> AuthorDate: Mon Oct 31 21:55:15 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Mon Oct 31 21:55:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D8f8676ad 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$ =20 + 31 Oct 2011; Sebastian Pipping defaults/initrd.scri= pts: + Fix return value of crypt_filter() which caused bogus LUKS opening err= ors + (bug #383545) + 30 Oct 2011; Sebastian Pipping genkernel: Bump version to 3.4.19 =20 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=3D$? + if [ ${res} -eq 0 ] then splash set_msg 'Disk unlocked.' fi + return ${res} fi } =20