Skip to content
Snippets Groups Projects
Commit 303d8522 authored by Canek Peláez Valdés's avatar Canek Peláez Valdés :slight_smile:
Browse files

Gentoo no longer uses the '2' suffix on the GRUB binaries and

configuration files.
parent f7193766
Branches
No related tags found
No related merge requests found
...@@ -241,13 +241,13 @@ function make_initrd() { ...@@ -241,13 +241,13 @@ function make_initrd() {
} }
# Updates grub # Updates grub
function _update_bootmanager_grub2() { function _update_bootmanager_grub() {
kinfo "Updating GRUB2..." kinfo "Updating GRUB..."
if [ "${MOUNT_BOOT_EFI}" == "yes" ]; then if [ "${MOUNT_BOOT_EFI}" == "yes" ]; then
kinfo "Mounting EFI boot directory..." kinfo "Mounting EFI boot directory..."
/bin/mountpoint -q /boot/efi || /bin/mount /boot/efi /bin/mountpoint -q /boot/efi || /bin/mount /boot/efi
fi fi
/usr/sbin/grub2-mkconfig -o "${GRUB2_CONFIG_FILE}" &>> "${LOGFILE}" || die /usr/sbin/grub-mkconfig -o "${GRUB_CONFIG_FILE}" &>> "${LOGFILE}" || die
} }
# Updates bootctl # Updates bootctl
...@@ -276,7 +276,7 @@ function _update_bootmanager_bootctl() { ...@@ -276,7 +276,7 @@ function _update_bootmanager_bootctl() {
function update_bootmanager() { function update_bootmanager() {
case "${BOOT_MANAGER}" in case "${BOOT_MANAGER}" in
grub) grub)
_update_bootmanager_grub2 _update_bootmanager_grub
;; ;;
bootctl) bootctl)
_update_bootmanager_bootctl _update_bootmanager_bootctl
......
...@@ -4,8 +4,8 @@ KERNEL_CONFIG="/etc/kerninst/kernel-config" ...@@ -4,8 +4,8 @@ KERNEL_CONFIG="/etc/kerninst/kernel-config"
# Bootmanager to use; grub or bootctl # Bootmanager to use; grub or bootctl
BOOT_MANAGER="bootctl" BOOT_MANAGER="bootctl"
# GRUB2 configuration file # GRUB configuration file
#GRUB2_CONFIG_FILE="/boot/grub/grub.cfg" #GRUB_CONFIG_FILE="/boot/grub/grub.cfg"
# Bootctl entries title # Bootctl entries title
BOOTCTL_TITLE="Gentoo Linux" BOOTCTL_TITLE="Gentoo Linux"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment