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

[Richard Yao]

commit:     1a15b80c8f987cce08cf588f0fae4ccda5a08374
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 20:36:48 2015 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> 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 <ryao <AT> 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}