[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     84367a16cd13999842f58a48a3e66e8ed8f76507
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 19:12:21 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 19:14:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=84367a16

genkernel: Fix initramfs location in msg regarding genkernel hardware detection 
feature

The fix for bug 689950 was incomplete: Sometimes, $TMPDIR is correct.

Fixes 323c9f71d7 ("genkernel: Use $BOOTDIR in msg regarding genkernel hardware 
detection feature")
Bug: https://bugs.gentoo.org/689950
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 genkernel | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/genkernel b/genkernel
index b6f1eaa..39ed262 100755
--- a/genkernel
+++ b/genkernel
@@ -380,9 +380,12 @@ then
 
        if isTrue "${show_warning_initramfs_is_required}" && isTrue 
"${BUILD_RAMDISK}"
        then
+               INITRAMFS_INSTALLED_IN="${TMPDIR}"
+               isTrue "${CMD_INSTALL}" && INITRAMFS_INSTALLED_IN="${BOOTDIR}"
+
                print_warning 1 '' 1 0
                print_warning 1 "If you require Genkernel's hardware detection 
features, you ${BOLD}MUST${NORMAL}"
-               print_warning 1 "tell your bootloader to use the provided 
initramfs file (${BOOTDIR}/initramfs-${KNAME}-${ARCH}-${KV})."
+               print_warning 1 "tell your bootloader to use the provided 
initramfs file (${INITRAMFS_INSTALLED_IN}/initramfs-${KNAME}-${ARCH}-${KV})."
        fi
        unset show_warning_initramfs_is_required
 fi