From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1099867-garchives=archives.gentoo.org@lists.gentoo.org>
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 EEBF9138334
for <garchives@archives.gentoo.org>; Tue, 16 Jul 2019 12:19:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 350B4E0817;
Tue, 16 Jul 2019 12:19:06 +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 00BE1E082D
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jul 2019 12:19:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 049CC347CE3
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jul 2019 12:19:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A9A316F1
for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jul 2019 12:19:03 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
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" <whissi@gentoo.org>
Message-ID: <1563279354.323c9f71d7d8255ac104bc1066e292e3f69c4a92.whissi@gentoo>
Subject: [gentoo-commits] proj/genkernel:master commit in: /
X-VCS-Repository: proj/genkernel
X-VCS-Files: genkernel
X-VCS-Directories: /
X-VCS-Committer: whissi
X-VCS-Committer-Name: Thomas Deutschmann
X-VCS-Revision: 323c9f71d7d8255ac104bc1066e292e3f69c4a92
X-VCS-Branch: master
Date: Tue, 16 Jul 2019 12:19:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 38595151-37e0-4e8a-a64b-3bbcd9893b5b
X-Archives-Hash: d488c9b7b5f9f3bd8e12e6eca57722dd
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