Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Libreboot build system
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD 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
Libreboot project
Libreboot build system
Commits
e2bd8e26
Commit
e2bd8e26
authored
1 year ago
by
livio
Committed by
Libreboot project
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Changed ISOLINUX config detection function to load from a list inside a variable
parent
1a4a2195
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
config/grub/config/grub.cfg
+9
-1
9 additions, 1 deletion
config/grub/config/grub.cfg
with
9 additions
and
1 deletion
config/grub/config/grub.cfg
+
9
−
1
View file @
e2bd8e26
...
...
@@ -80,6 +80,8 @@ set pager=1
read
}
# FIXME Make an automatic override for BTRFS directories instead of copypasting with a "@/" in front of every element
# Default list of GRUB possible directories. The @/... entries are for cases where the BTRFS filesystem is being used
set
grub_dirs
=
"boot grub grub2 boot/grub boot/grub2 @/boot @/grub @/grub2 @/boot/grub @/boot/grub2"
# Default list of GRUB possible config files prefixes
...
...
@@ -99,6 +101,7 @@ function try_user_grub_config {
fi
done
}
function
search_grub
{
echo
-n
"Attempting
to
load
grub.cfg
from
'${1}'
devices"
for
i
in
0
1
2
3
4
5
6
7
8
9
10
11
; do
...
...
@@ -111,9 +114,12 @@ function search_grub {
echo
# Insert newline
}
# Default list of ISOLINUX possible directories. The @/... entries are for cases where the BTRFS filesystem is being used
set
isolinux_dirs
=
"'' /boot /EFI /boot/EFI /@ /@/boot /@/boot/EFI /@/EFI"
function
try_isolinux_config
{
set
root
=
"${1}"
for
dir
in
''
/boot
/EFI
/boot/EFI
/@
/@/boot
/@/boot/EFI
/@/EFI
; do
for
dir
in
${isolinux_dirs}
; do
if
[ -f "${dir}"/isolinux/isolinux.cfg ]
; then
syslinux_configfile
-i
"${dir}"/isolinux/isolinux.cfg
elif
[ -f "${dir}"/syslinux/syslinux.cfg ]
; then
...
...
@@ -125,6 +131,7 @@ function try_isolinux_config {
fi
done
}
function
search_isolinux
{
echo
"\nAttempting
to
parse
iso/sys/extlinux
config
from
'${1}'
devices"
for
i
in
0
1
2
3
4
5
6
7
8
9
10
11
; do
...
...
@@ -136,6 +143,7 @@ function search_isolinux {
done
echo
# Insert newline
}
function
try_bootcfg
{
try_user_grub_config
"${1}"
try_isolinux_config
"${1}"
...
...
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