From: Peter Hjalmarsson <xake@rymdraket.net>
Date: Wed, 22 Aug 2012 17:12:08 +0000 (+0200)
Subject: Make root_trim work with crypt_root_key
X-Git-Tag: v3.4.42~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e779547b728506a933809e4b03c4ed6b329f8e08;p=genkernel.git

Make root_trim work with crypt_root_key

Keep options already set for cryptsetup when using crypt_root_key*
---

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 082d44d..03e61e0 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -904,10 +904,10 @@ openLUKS() {
 					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 -"
+						cryptsetup_options="${cryptsetup_options} -d -"
 						gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
 					else
-						cryptsetup_options="-d ${mntkey}${LUKS_KEY}"
+						cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}"
 					fi
 				fi
 				# At this point, keyfile or not, we're ready!