diff options
author | Francis Rowe <info@gluglug.org.uk> | 2015-04-11 12:52:56 (EDT) |
---|---|---|
committer | Francis Rowe <info@gluglug.org.uk> | 2015-04-11 12:53:56 (EDT) |
commit | dd96f9d76ec9369aeb38d8e6658d0d4d0473e141 (patch) | |
tree | 74d771f3a25d677cb1483a3bb1bf3fdc8784989e | |
parent | 2d45902fecb937d84cc2e4d9ed36999779516032 (diff) | |
download | libreboot-dd96f9d76ec9369aeb38d8e6658d0d4d0473e141.zip libreboot-dd96f9d76ec9369aeb38d8e6658d0d4d0473e141.tar.gz libreboot-dd96f9d76ec9369aeb38d8e6658d0d4d0473e141.tar.bz2 |
grub.cfg: Also scan for grub2/grub.cfg, not just grub/grub.cfg
A Fedora 21 user had issues. This should make them happy.
-rw-r--r-- | resources/grub/config/menuentries/common.cfg | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg index 7dacc69..c6b5109 100644 --- a/resources/grub/config/menuentries/common.cfg +++ b/resources/grub/config/menuentries/common.cfg @@ -94,6 +94,20 @@ menuentry 'Search for GRUB configuration (grub.cfg) outside of CBFS' { unset superusers } fi + if [ -f "$x/grub2/grub.cfg" ] ; then + submenu "Load Config from $x" $x { + root=$2 + source /grub2/grub.cfg + unset superusers + } + fi + if [ -f "$x/boot/grub2/grub.cfg" ] ; then + submenu "Load Config from $x" $x { + root=$2 + source /boot/grub2/grub.cfg + unset superusers + } + fi done } |