From b817001e29605303b6ab95d05b6594a508af8850 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 18 Dec 2023 06:45:56 +0000 Subject: [PATCH] grub.cfg: don't boot linux without a grub.cfg the fallback code in the main menuentry is potentially unsafe, depending on user config. Signed-off-by: Leah Rowe --- config/grub/config/grub.cfg | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/config/grub/config/grub.cfg b/config/grub/config/grub.cfg index f6b5a193..69ed35b2 100644 --- a/config/grub/config/grub.cfg +++ b/config/grub/config/grub.cfg @@ -146,32 +146,6 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o try_user_config "${vol}" done - if [ "${grub_scan_disk}" != "ata" ]; then - # Last resort, if all else fails - 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 - fi - done - fi - - if [ "${grub_scan_disk}" != "ahci" ]; then - # Last resort (for setups that use IDE instead of SATA) - set root=ata0,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 - fi - done - fi - true # Prevent pager requiring to accept each line instead of whole screen }