diff options
| author |   Peter Hjalmarsson <xake@rymdraket.net> | 2012-08-22 19:12:08 +0200 |
|---|---|---|
| committer | Peter Hjalmarsson <xake@rymdraket.net> | 2012-08-28 14:09:24 +0200 |
| commit | e779547b728506a933809e4b03c4ed6b329f8e08 (patch) | |
| tree | 266e8c482fe38e94564bf1343675e6236fa8b406 | |
| parent | modules/lvm: dm-thin-pool now requires dm-persistent-data and libcrc32c (diff) | |
| download | genkernel-e779547b728506a933809e4b03c4ed6b329f8e08.tar.gz genkernel-e779547b728506a933809e4b03c4ed6b329f8e08.tar.bz2 genkernel-e779547b728506a933809e4b03c4ed6b329f8e08.zip | |
Make root_trim work with crypt_root_key
Keep options already set for cryptsetup when using crypt_root_key*
| -rwxr-xr-x | defaults/initrd.scripts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 082d44d1..03e61e09 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! |