Skip to content
Snippets Groups Projects
Commit e709aed1 authored by livio's avatar livio Committed by Libreboot project
Browse files

Refactored try_user_config function name

parent 4b918b48
No related branches found
No related tags found
No related merge requests found
...@@ -40,7 +40,7 @@ if [ -f (cbfsdisk)/keymap.gkb ]; then ...@@ -40,7 +40,7 @@ if [ -f (cbfsdisk)/keymap.gkb ]; then
keymap (cbfsdisk)/keymap.gkb keymap (cbfsdisk)/keymap.gkb
fi fi
function try_user_config { function try_user_grub_config {
set root="${1}" set root="${1}"
# The @/... entries are for cases where the BTRFS filesystem is being used # The @/... entries are for cases where the BTRFS filesystem is being used
for dir in boot grub grub2 boot/grub boot/grub2 @/boot @/grub @/grub2 @/boot/grub @/boot/grub2; do for dir in boot grub grub2 boot/grub boot/grub2 @/boot @/grub @/grub2 @/boot/grub @/boot/grub2; do
...@@ -59,10 +59,10 @@ function search_grub { ...@@ -59,10 +59,10 @@ function search_grub {
echo -n "Attempting to load grub.cfg from '${1}' devices" 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 for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
try_user_config "(${1}${i},${part})" try_user_grub_config "(${1}${i},${part})"
done done
# raw devices e.g. (ahci0) instead of (ahci0,1) # raw devices e.g. (ahci0) instead of (ahci0,1)
try_user_config "(${1}${i})" try_user_grub_config "(${1}${i})"
done done
echo # Insert newline echo # Insert newline
} }
...@@ -93,7 +93,7 @@ function search_isolinux { ...@@ -93,7 +93,7 @@ function search_isolinux {
echo # Insert newline echo # Insert newline
} }
function try_bootcfg { function try_bootcfg {
try_user_config "${1}" try_user_grub_config "${1}"
try_isolinux_config "${1}" try_isolinux_config "${1}"
} }
function search_bootcfg { function search_bootcfg {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment