commit:     323c9f71d7d8255ac104bc1066e292e3f69c4a92
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 11:29:49 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 12:15:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=323c9f71

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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/genkernel b/genkernel
index cae0330..eae61a3 100755
--- a/genkernel
+++ b/genkernel
@@ -379,11 +379,11 @@ then
        print_info 1 'Where $ROOT is the device node for your root partition as 
the'
        print_info 1 'one specified in /etc/fstab'
 
-       if isTrue "${show_warning_initramfs_is_required}"
+       if isTrue "${show_warning_initramfs_is_required}" && isTrue 
"${BUILD_RAMDISK}"
        then
                echo
                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 (${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV})."
+               print_warning 1 "tell your bootloader to use the provided 
initramfs file (${BOOTDIR}/initramfs-${KNAME}-${ARCH}-${KV})."
        fi
        unset show_warning_initramfs_is_required
 fi
@@ -394,6 +394,10 @@ then
        then
                print_info 1 ''
                print_info 1 "You will find the initramfs in 
'${TMPDIR}/initramfs-${KNAME}-${ARCH}-${KV}'."
+       elif ! isTrue "${BUILD_KERNEL}" && isTrue "${CMD_INSTALL}"
+       then
+               print_info 1 ''
+               print_info 1 "You will find the initramfs in 
'${BOOTDIR}/initramfs-${KNAME}-${ARCH}-${KV}'."
        fi
 
        echo

Reply via email to