Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/
Date: Tue, 30 Aug 2011 15:34:15
Message-Id: 3453a0621c20576f9b3249215187f34ed55014f0.sping@gentoo
1 commit: 3453a0621c20576f9b3249215187f34ed55014f0
2 Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
3 AuthorDate: Tue Aug 30 15:33:27 2011 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 30 15:33:27 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=3453a062
7
8 Fix quoting issue (bug #380729)
9
10 ---
11 ChangeLog | 6 ++++++
12 defaults/initrd.scripts | 2 +-
13 2 files changed, 7 insertions(+), 1 deletions(-)
14
15 diff --git a/ChangeLog b/ChangeLog
16 index 6b00bda..fd11f8e 100644
17 --- a/ChangeLog
18 +++ b/ChangeLog
19 @@ -5,6 +5,12 @@
20 # Distributed under the GPL v2
21 # $Id$
22
23 + 30 Aug 2011; Sebastian Pipping <sping@g.o> defaults/initrd.scripts:
24 + Fix quoting issue (bug #380729).
25 +
26 + Thanks to:
27 + - Axel Bringenberg
28 +
29 30 Aug 2011; Sebastian Pipping <sping@g.o>
30 +patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch, gen_compile.sh:
31 Enable patch application for mdadm, add patch to fix compilation (bug
32
33 diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
34 index 32e3417..bf31042 100755
35 --- a/defaults/initrd.scripts
36 +++ b/defaults/initrd.scripts
37 @@ -858,7 +858,7 @@ openLUKS() {
38 fi
39 # At this point a candidate key exists (either mounted before or not)
40 good_msg "${LUKS_KEY} on device ${LUKS_KEYDEV} found" ${CRYPT_SILENT}
41 - if [ $(echo ${LUKS_KEY} | grep -o '.gpg$') = ".gpg" ] && [ -e /sbin/gpg ] ; then
42 + if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then
43 [ -e /dev/tty ] && mv /dev/tty /dev/tty.org
44 mknod /dev/tty c 5 1
45 cryptsetup_options="-d -"