aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2011-08-30 15:33:27 (GMT)
committerSebastian Pipping <sebastian@pipping.org>2011-08-30 15:33:27 (GMT)
commit3453a0621c20576f9b3249215187f34ed55014f0 (patch)
tree7b9dba8d479c9ff97db0f71bc400101ab14386b8
parentEnable patch application for mdadm, add patch to fix compilation (bug #381089) (diff)
downloadgenkernel-3453a0621c20576f9b3249215187f34ed55014f0.zip
genkernel-3453a0621c20576f9b3249215187f34ed55014f0.tar.gz
genkernel-3453a0621c20576f9b3249215187f34ed55014f0.tar.bz2
Fix quoting issue (bug #380729)
-rw-r--r--ChangeLog6
-rwxr-xr-xdefaults/initrd.scripts2
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$
+ 30 Aug 2011; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+ Fix quoting issue (bug #380729).
+
+ Thanks to:
+ - Axel Bringenberg
+
30 Aug 2011; Sebastian Pipping <sping@gentoo.org>
+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 not)
good_msg "${LUKS_KEY} on device ${LUKS_KEYDEV} found" ${CRYPT_SILENT}
- if [ $(echo ${LUKS_KEY} | grep -o '.gpg$') = ".gpg" ] && [ -e /sbin/gpg ] ; then
+ if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then
[ -e /dev/tty ] && mv /dev/tty /dev/tty.org
mknod /dev/tty c 5 1
cryptsetup_options="-d -"