diff --git a/config/grub/config/grub.cfg b/config/grub/config/grub.cfg index b25f9fab7dad43d8e8478450d3cfcb09d49571ed..df1556e9b663a38c8986c828f9a7cbcfb834a4da 100644 --- a/config/grub/config/grub.cfg +++ b/config/grub/config/grub.cfg @@ -40,7 +40,7 @@ if [ -f (cbfsdisk)/keymap.gkb ]; then keymap (cbfsdisk)/keymap.gkb fi -function try_user_config { +function try_user_grub_config { set root="${1}" # 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 @@ -59,10 +59,10 @@ 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 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 # raw devices e.g. (ahci0) instead of (ahci0,1) - try_user_config "(${1}${i})" + try_user_grub_config "(${1}${i})" done echo # Insert newline } @@ -93,7 +93,7 @@ function search_isolinux { echo # Insert newline } function try_bootcfg { - try_user_config "${1}" + try_user_grub_config "${1}" try_isolinux_config "${1}" } function search_bootcfg {