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

[Robin H. Johnson]

commit:     d0e7c2c7b9615ca369970bf37ae7ad16c293ee17
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 23:23:37 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 23:23:37 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d0e7c2c7

gen_bootloader: grub2-mkconfig is sometimes now grub-mkconfig, per bug #591200.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_bootloader.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index 4bbd303..fdca749 100755
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -49,8 +49,10 @@ set_bootloader_grub2() {
        fi
 
        print_info 1 "You can customize Grub2 parameters in /etc/default/grub."
-       print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
-       grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || gen_die 
"grub2-mkconfig failed"
+       print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..."
+       grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
+               grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
+               gen_die "grub-mkconfig failed"
        [ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' 
"${GRUB_CONF}"
 }