From: Sebastian Pipping Date: Tue, 30 Aug 2011 15:33:27 +0000 (+0200) Subject: Fix quoting issue (bug #380729) X-Git-Tag: v3.4.19~10 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3453a0621c20576f9b3249215187f34ed55014f0;p=genkernel.git Fix quoting issue (bug #380729) --- 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 defaults/initrd.scripts: + 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 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 -"