From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-499908-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 16ACD138010
	for <garchives@archives.gentoo.org>; Tue, 28 Aug 2012 12:13:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 84086E0654;
	Tue, 28 Aug 2012 12:13:21 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 4F2A9E0654
	for <gentoo-commits@lists.gentoo.org>; Tue, 28 Aug 2012 12:13:20 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 4F9BB33D8B8
	for <gentoo-commits@lists.gentoo.org>; Tue, 28 Aug 2012 12:13:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 0CE4FE543C
	for <gentoo-commits@lists.gentoo.org>; Tue, 28 Aug 2012 12:13:19 +0000 (UTC)
From: "Peter Hjalmarsson" <xake@rymdraket.net>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Peter Hjalmarsson" <xake@rymdraket.net>
Message-ID: <1346155764.e779547b728506a933809e4b03c4ed6b329f8e08.xake@gentoo>
Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/
X-VCS-Repository: proj/genkernel
X-VCS-Files: defaults/initrd.scripts
X-VCS-Directories: defaults/
X-VCS-Committer: xake
X-VCS-Committer-Name: Peter Hjalmarsson
X-VCS-Revision: e779547b728506a933809e4b03c4ed6b329f8e08
X-VCS-Branch: master
Date: Tue, 28 Aug 2012 12:13:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9f1f0e25-f817-473a-8300-23fe464e0b4b
X-Archives-Hash: 4c3334c98d121c7aa25e5bbcba91383d

commit:     e779547b728506a933809e4b03c4ed6b329f8e08
Author:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Wed Aug 22 17:12:08 2012 +0000
Commit:     Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
CommitDate: Tue Aug 28 12:09:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e779547b

Make root_trim work with crypt_root_key

Keep options already set for cryptsetup when using crypt_root_key*

---
 defaults/initrd.scripts |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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!