From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3F5C113989B for ; Tue, 25 Aug 2015 22:17:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9703B14245; Tue, 25 Aug 2015 22:17:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A60A141B2 for ; Tue, 25 Aug 2015 22:17:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E45C340ABC for ; Tue, 25 Aug 2015 22:17:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C6D1167 for ; Tue, 25 Aug 2015 22:17:15 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1440540981.1a15b80c8f987cce08cf588f0fae4ccda5a08374.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_bootloader.sh X-VCS-Directories: / X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 1a15b80c8f987cce08cf588f0fae4ccda5a08374 X-VCS-Branch: master Date: Tue, 25 Aug 2015 22:17:15 +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-Archives-Salt: f2b37d51-a482-4310-ac72-96e4465acc30 X-Archives-Hash: 64273f44b80bf6b1f4edded105b22cdc commit: 1a15b80c8f987cce08cf588f0fae4ccda5a08374 Author: Richard Yao gentoo org> AuthorDate: Sat Aug 15 20:36:48 2015 +0000 Commit: Richard Yao gentoo org> CommitDate: Tue Aug 25 22:16:21 2015 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1a15b80c Prefer /boot/grub/grub.cfg Gentoo migrated to /boot/grub/grub.cfg about 18 months ago. Preferring /boot/grub2/grub.cfg will cause us to update the wrong config file. Continue supporting the old location should users run old versions versions. Signed-off-by: Richard Yao gentoo.org> gen_bootloader.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen_bootloader.sh b/gen_bootloader.sh index b9ec14d..90c3f9b 100755 --- a/gen_bootloader.sh +++ b/gen_bootloader.sh @@ -34,8 +34,8 @@ set_bootloader_grub_read_device_map() { set_bootloader_grub2() { local GRUB_CONF for candidate in \ - "${BOOTDIR}/grub2/grub.cfg" \ "${BOOTDIR}/grub/grub.cfg" \ + "${BOOTDIR}/grub2/grub.cfg" \ ; do if [[ -e "${candidate}" ]]; then GRUB_CONF=${candidate}