summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/grub/config/menuentries/common.cfg35
1 files changed, 16 insertions, 19 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 8e14c3b..ec2def3 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -30,27 +30,24 @@ menuentry 'Load Operating System' {
done
done
-# Last resort, otherwise go to GRUB shell
- for devname in "md/0" "ahci0"; do
- case ${devname} in
- ahci0)
- rootdev="/dev/sda1"
- set root='ahci0,1'
- ;;
- *)
- rootdev="/dev/md0"
- set root='md/0'
- ;;
- esac
+ set root='md/0'
+ for p in "/" "/boot/"; do
+ if [ -f "${p}vmlinuz" ] ; then
+ linux ${p}vmlinuz root=/dev/md0 rw
+ if [ -f "${p}initrd.img" ] ; then
+ initrd ${p}initrd.img
+ fi
+ fi
+ done
- for p in "/" "/boot/"; do
- if [ -f "${p}vmlinuz" ] ; then
- linux ${p}vmlinuz root=${rootdev} rw
- if [ -f "${p}initrd.img" ] ; then
- initrd ${p}initrd.img
- fi
+ set root='ahci0,1'
+ for p in "/" "/boot/"; do
+ if [ -f "${p}vmlinuz" ] ; then
+ linux ${p}vmlinuz root=/dev/sda1 rw
+ if [ -f "${p}initrd.img" ] ; then
+ initrd ${p}initrd.img
fi
- done
+ fi
done
}
menuentry 'Parse ISOLINUX menu (SATA)' {