From 835ff5ec83ff8385d81eef285d38068636fe4ed0 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Wed, 29 Dec 2021 06:55:07 +0000
Subject: grub.cfg: skip ata/ahci according to grub_scan_disk

logic for setting it in grub.cfg will be done in the next commit
---
 resources/grub/config/grub.cfg | 58 ++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/resources/grub/config/grub.cfg b/resources/grub/config/grub.cfg
index d9bf6df2..95389054 100644
--- a/resources/grub/config/grub.cfg
+++ b/resources/grub/config/grub.cfg
@@ -28,6 +28,7 @@ fi
 set default="0"
 set timeout=10
 set pager=1
+set grub_scan_disk="both"
 
 keymap usqwerty
 function try_user_config {
@@ -75,8 +76,13 @@ function search_isolinux {
 	echo # Insert newline
 }
 menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o' {
-	search_grub ahci
-	search_grub ata
+
+	if [ "${grub_scan_disk}" != "ata" ]; then
+		search_grub ahci
+	fi
+	if [ "${grub_scan_disk}" != "ahci" ]; then
+		search_grub ata
+	fi
 
 	# grub device enumeration is very slow, so checks are hardcoded
 
@@ -97,8 +103,12 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 	unset atadev
 	for i in 11 10 9 8 7 6 5 4 3 2 1 0; do
 		for part in 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1; do
-			ahcidev="(ahci${i},${part}) ${ahcidev}"
-			atadev="(ata${i},${part}) ${atadev}"
+			if [ "${grub_scan_disk}" != "ata" ]; then
+				ahcidev="(ahci${i},${part}) ${ahcidev}"
+			fi
+			if [ "${grub_scan_disk}" != "ahci" ]; then
+				atadev="(ata${i},${part}) ${atadev}"
+			fi
 		done
 	done
 
@@ -117,27 +127,31 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 
 	search_grub crypto
 
-	# 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
+	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
-		fi
-	done
+		done
+	fi
 
-	# 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
+	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
-		fi
-	done
+		done
+	fi
 
 	true # Prevent pager requiring to accept each line instead of whole screen
 }
-- 
cgit v1.2.1