From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 02374138334 for ; Thu, 29 Aug 2019 20:49:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1961E0814; Thu, 29 Aug 2019 20:49:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9B35E0814 for ; Thu, 29 Aug 2019 20:49:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6AE9834A635 for ; Thu, 29 Aug 2019 20:49:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90AE0778 for ; Thu, 29 Aug 2019 20:49:09 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1567111593.1f0028b52e110602975aa6bc25ca52d58bc9ea91.whissi@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: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 1f0028b52e110602975aa6bc25ca52d58bc9ea91 X-VCS-Branch: master Date: Thu, 29 Aug 2019 20:49:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 012ead5e-0736-4a0b-bb91-c114bf3abb57 X-Archives-Hash: 46266f050752b3e12f92c39702879f9a commit: 1f0028b52e110602975aa6bc25ca52d58bc9ea91 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Aug 29 20:46:33 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Aug 29 20:46:33 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1f0028b5 initrd.scripts: openLUKS(): gpg was moved to /usr/bin Bug: https://bugs.gentoo.org/693006 Signed-off-by: Thomas Deutschmann gentoo.org> defaults/initrd.scripts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index b33fad7..2969f44 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1792,7 +1792,7 @@ openLUKS() { if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] then - if [ ! -x '/sbin/gpg' ] + if [ ! -x '/usr/bin/gpg' ] then bad_msg "GPG-encrypted key file provided but gpg program is missing. Was initramfs built without --gpg parameter?" bad_msg "Falling back to passphrase usage!" @@ -1800,7 +1800,7 @@ openLUKS() { [ -e /dev/tty ] && run mv /dev/tty /dev/tty.org run mknod /dev/tty c 5 1 cryptsetup_options="${cryptsetup_options} -d -" - gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |" + gpg_cmd="/usr/bin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |" fi else cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}"