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 1QyQKN-0007OI-6w for garchives@archives.gentoo.org; Tue, 30 Aug 2011 15:34:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7B2021C2F2; Tue, 30 Aug 2011 15:34:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7BA7421C2F2 for ; Tue, 30 Aug 2011 15:34:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0FB4E1B4160 for ; Tue, 30 Aug 2011 15:34:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6913680040 for ; Tue, 30 Aug 2011 15:34:06 +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: <3453a0621c20576f9b3249215187f34ed55014f0.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: 3453a0621c20576f9b3249215187f34ed55014f0 Date: Tue, 30 Aug 2011 15:34:06 +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: X-Archives-Hash: 12c900db1fe7a79d86c9754a4661e514 commit: 3453a0621c20576f9b3249215187f34ed55014f0 Author: Sebastian Pipping pipping org> AuthorDate: Tue Aug 30 15:33:27 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Tue Aug 30 15:33:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D3453a062 Fix quoting issue (bug #380729) --- ChangeLog | 6 ++++++ defaults/initrd.scripts | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b00bda..fd11f8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ # Distributed under the GPL v2 # $Id$ =20 + 30 Aug 2011; Sebastian Pipping defaults/initrd.scri= pts: + Fix quoting issue (bug #380729). + + Thanks to: + - Axel Bringenberg + 30 Aug 2011; Sebastian Pipping +patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch, gen_compile.sh: Enable patch application for mdadm, add patch to fix compilation (bug diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 32e3417..bf31042 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -858,7 +858,7 @@ openLUKS() { fi # At this point a candidate key exists (either mounted before or no= t) good_msg "${LUKS_KEY} on device ${LUKS_KEYDEV} found" ${CRYPT_SILEN= T} - if [ $(echo ${LUKS_KEY} | grep -o '.gpg$') =3D ".gpg" ] && [ -e /sb= in/gpg ] ; then + if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" =3D ".gpg" ] && [ -e /= sbin/gpg ] ; then [ -e /dev/tty ] && mv /dev/tty /dev/tty.org mknod /dev/tty c 5 1 cryptsetup_options=3D"-d -"