From 303d8522fe6d1b3b13d68adbd3a36fd448745098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Canek=20Pel=C3=A1ez=20Vald=C3=A9s?= <canek@ciencias.unam.mx>
Date: Thu, 18 Aug 2016 18:24:50 -0500
Subject: [PATCH] Gentoo no longer uses the '2' suffix on the GRUB binaries and
 configuration files.

---
 kerninst      | 8 ++++----
 kerninst.conf | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kerninst b/kerninst
index eb20c7b..5e8ba10 100644
--- a/kerninst
+++ b/kerninst
@@ -241,13 +241,13 @@ function make_initrd() {
 }
 
 # Updates grub
-function _update_bootmanager_grub2() {
-    kinfo "Updating GRUB2..."
+function _update_bootmanager_grub() {
+    kinfo "Updating GRUB..."
     if [ "${MOUNT_BOOT_EFI}" == "yes" ]; then
         kinfo "Mounting EFI boot directory..."
         /bin/mountpoint -q  /boot/efi || /bin/mount /boot/efi
     fi
-    /usr/sbin/grub2-mkconfig -o "${GRUB2_CONFIG_FILE}" &>> "${LOGFILE}" || die
+    /usr/sbin/grub-mkconfig -o "${GRUB_CONFIG_FILE}" &>> "${LOGFILE}" || die
 }
 
 # Updates bootctl
@@ -276,7 +276,7 @@ function _update_bootmanager_bootctl() {
 function update_bootmanager() {
     case "${BOOT_MANAGER}" in
         grub)
-            _update_bootmanager_grub2
+            _update_bootmanager_grub
             ;;
         bootctl)
             _update_bootmanager_bootctl
diff --git a/kerninst.conf b/kerninst.conf
index 8d3b5f1..ddc335a 100644
--- a/kerninst.conf
+++ b/kerninst.conf
@@ -4,8 +4,8 @@ KERNEL_CONFIG="/etc/kerninst/kernel-config"
 # Bootmanager to use; grub or bootctl
 BOOT_MANAGER="bootctl"
 
-# GRUB2 configuration file
-#GRUB2_CONFIG_FILE="/boot/grub/grub.cfg"
+# GRUB configuration file
+#GRUB_CONFIG_FILE="/boot/grub/grub.cfg"
 
 # Bootctl entries title
 BOOTCTL_TITLE="Gentoo Linux"
-- 
GitLab