Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Kernel Installer
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Canek Peláez Valdés
Kernel Installer
Commits
303d8522
Commit
303d8522
authored
8 years ago
by
Canek Peláez Valdés
Browse files
Options
Downloads
Patches
Plain Diff
Gentoo no longer uses the '2' suffix on the GRUB binaries and
configuration files.
parent
f7193766
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
kerninst
+4
-4
4 additions, 4 deletions
kerninst
kerninst.conf
+2
-2
2 additions, 2 deletions
kerninst.conf
with
6 additions
and
6 deletions
kerninst
+
4
−
4
View file @
303d8522
...
@@ -241,13 +241,13 @@ function make_initrd() {
...
@@ -241,13 +241,13 @@ function make_initrd() {
}
}
# Updates grub
# Updates grub
function
_update_bootmanager_grub
2
()
{
function
_update_bootmanager_grub
()
{
kinfo
"Updating GRUB
2
..."
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/grub
2
-mkconfig
-o
"
${
GRUB
2
_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_grub
2
_update_bootmanager_grub
;;
;;
bootctl
)
bootctl
)
_update_bootmanager_bootctl
_update_bootmanager_bootctl
...
...
This diff is collapsed.
Click to expand it.
kerninst.conf
+
2
−
2
View file @
303d8522
...
@@ -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"
# GRUB
2
configuration file
# GRUB configuration file
#GRUB
2
_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"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment