summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-06-04 19:38:11 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-06-04 19:38:11 (EDT)
commit7824eb7a272a8bea7305337fa2925fdf3c72e956 (patch)
tree56911ce669ae3cdf2490237c06abf72fecd3eb3a /resources
parent698e6ea2df1f04a46b3cc3621734bb49652a61c5 (diff)
downloadlibreboot-7824eb7a272a8bea7305337fa2925fdf3c72e956.zip
libreboot-7824eb7a272a8bea7305337fa2925fdf3c72e956.tar.gz
libreboot-7824eb7a272a8bea7305337fa2925fdf3c72e956.tar.bz2
grub.cfg: also look for /boot/vmlinuz and /boot/initrd.img
Diffstat (limited to 'resources')
-rw-r--r--resources/grub/config/menuentries/common.cfg13
1 files changed, 10 insertions, 3 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index c6b5109..3ac2bf4 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -14,9 +14,16 @@ menuentry 'Load Operating System' {
done
set root='ahci0,1'
- linux /vmlinuz root=/dev/sda1 rw
- if [ -f "/initrd.img" ] ; then
- initrd /initrd.img
+ if [ -f "/vmlinuz" ] ; then
+ linux /vmlinuz root=/dev/sda1 rw
+ if [ -f "/initrd.img" ] ; then
+ initrd /initrd.img
+ fi
+ elif [ -f "/boot/vmlinuz" ] ; then
+ linux /boot/vmlinuz root=/dev/sda1 rw
+ if [ -f "/boot/initrd.img" ] ; then
+ initrd /boot/initrd.img
+ fi
fi
}
menuentry 'Parse ISOLINUX menu (ahci0)' {