diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2015-09-22 08:02:48 (EDT) |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2015-09-22 08:02:48 (EDT) |
| commit | 196ae33323d65c7de6d45d5ab333298d5e21ebe8 (patch) | |
| tree | e18576b8b4b16e09e1a9c41f9cd25a7f362f27fb /resources/grub/config | |
| parent | 03409abe1196e85f5c72e20448dec135b35b9287 (diff) | |
| download | libreboot-196ae33323d65c7de6d45d5ab333298d5e21ebe8.zip libreboot-196ae33323d65c7de6d45d5ab333298d5e21ebe8.tar.gz libreboot-196ae33323d65c7de6d45d5ab333298d5e21ebe8.tar.bz2 | |
grub.cfg: RAID support (2)
Diffstat (limited to 'resources/grub/config')
| -rw-r--r-- | resources/grub/config/menuentries/common.cfg | 35 |
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)' { |