| 1 |
commit: 1f0028b52e110602975aa6bc25ca52d58bc9ea91 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 29 20:46:33 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 29 20:46:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1f0028b5 |
| 7 |
|
| 8 |
initrd.scripts: openLUKS(): gpg was moved to /usr/bin |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/693006 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
defaults/initrd.scripts | 4 ++-- |
| 14 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 17 |
index b33fad7..2969f44 100644 |
| 18 |
--- a/defaults/initrd.scripts |
| 19 |
+++ b/defaults/initrd.scripts |
| 20 |
@@ -1792,7 +1792,7 @@ openLUKS() { |
| 21 |
|
| 22 |
if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] |
| 23 |
then |
| 24 |
- if [ ! -x '/sbin/gpg' ] |
| 25 |
+ if [ ! -x '/usr/bin/gpg' ] |
| 26 |
then |
| 27 |
bad_msg "GPG-encrypted key file provided but gpg program is missing. Was initramfs built without --gpg parameter?" |
| 28 |
bad_msg "Falling back to passphrase usage!" |
| 29 |
@@ -1800,7 +1800,7 @@ openLUKS() { |
| 30 |
[ -e /dev/tty ] && run mv /dev/tty /dev/tty.org |
| 31 |
run mknod /dev/tty c 5 1 |
| 32 |
cryptsetup_options="${cryptsetup_options} -d -" |
| 33 |
- gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |" |
| 34 |
+ gpg_cmd="/usr/bin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |" |
| 35 |
fi |
| 36 |
else |
| 37 |
cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}" |
Archives