| 1 |
commit: e779547b728506a933809e4b03c4ed6b329f8e08 |
| 2 |
Author: Peter Hjalmarsson <xake <AT> rymdraket <DOT> net> |
| 3 |
AuthorDate: Wed Aug 22 17:12:08 2012 +0000 |
| 4 |
Commit: Peter Hjalmarsson <xake <AT> rymdraket <DOT> net> |
| 5 |
CommitDate: Tue Aug 28 12:09:24 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e779547b |
| 7 |
|
| 8 |
Make root_trim work with crypt_root_key |
| 9 |
|
| 10 |
Keep options already set for cryptsetup when using crypt_root_key* |
| 11 |
|
| 12 |
--- |
| 13 |
defaults/initrd.scripts | 4 ++-- |
| 14 |
1 files changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 17 |
index 082d44d..03e61e0 100755 |
| 18 |
--- a/defaults/initrd.scripts |
| 19 |
+++ b/defaults/initrd.scripts |
| 20 |
@@ -904,10 +904,10 @@ openLUKS() { |
| 21 |
if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then |
| 22 |
[ -e /dev/tty ] && mv /dev/tty /dev/tty.org |
| 23 |
mknod /dev/tty c 5 1 |
| 24 |
- cryptsetup_options="-d -" |
| 25 |
+ cryptsetup_options="${cryptsetup_options} -d -" |
| 26 |
gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |" |
| 27 |
else |
| 28 |
- cryptsetup_options="-d ${mntkey}${LUKS_KEY}" |
| 29 |
+ cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}" |
| 30 |
fi |
| 31 |
fi |
| 32 |
# At this point, keyfile or not, we're ready! |
Archives