From 9e548dae39a5b825f29d5073ba433188d5e20b45 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sat, 2 Jan 2016 17:43:47 +0000
Subject: grub.cfg: don't touch ahci1

This slows down boot on some systems that have buggy CD/DVD drives
---
 resources/grub/config/menuentries/common.cfg | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'resources/grub')

diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 3739b457..9c9c8c17 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -33,10 +33,8 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 	#	b) Try MBR/GPT partitions at last, one might still conviniently uses a single partition
 
 	# prompt user for passphrase if LUKS header is found
-	for d in md/0 ahci0 ahci1; do 		cryptomount ${d}; done
-	for j in 1 2 3 4 5 6 7 8 9; do
-		for d in ahci0 ahci1; do 			cryptomount "${d},${j}"; done
-	done
+	for d in md/0 ahci0; do 		cryptomount ${d}; done
+	for j in 1 2 3 4 5 6 7 8 9; do cryptomount "ahci0,${j}"; done
 
 	#   (This way, we only need to scan for encrypted data once while covering every possible disk setup,
 	#    be it BTRFS/ZFS/ext4/etc. (on LUKS) (on RAID) on/across raw devices/MBR/GPT
@@ -44,9 +42,9 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 	# 2. Look for user config. If the above routine successfully decrypted a LUKS container, its content
 	#    will be searched before everything else for obvious reasons. Regardless of this, the devices'
 	#    hirachy stays the same.
-	for d in crypto0 md/0 ahci0 ahci1; do 	switch_to_grub_config ${d}; done
+	for d in crypto0 md/0 ahci0; do 	switch_to_grub_config ${d}; done
 	for j in 1 2 3 4 5 6 7 8 9; do
-		for d in crypto0 ahci0 ahci1; do 	switch_to_grub_config "${d},${j}"; done
+		for d in crypto0 ahci0; do 	switch_to_grub_config "${d},${j}"; done
 	done
 
 	# prompt user for passphrase if LUKS header is found but try using external keyfiles first
@@ -75,13 +73,11 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 	done
 }
 menuentry 'Parse ISOLINUX menu (AHCI)  [a]' --hotkey='a' {
-	for i in 0 1; do
-		# Check for filesystem on raw device without partition table (MBR/GPT), e.g. BTRFS or ZFS
-		parse_isolinux_config ahci${i}
-		# Look for partitions
-		# GPT allows more than 4 partitions, /boot on /dev/sda7 is quite unlikely but still possible
-		for j in 0 1 2 3 4 5 6 7 8 9; do parse_isolinux_config "ahci${i},${j}"; done
-	done
+	# Check for filesystem on raw device without partition table (MBR/GPT), e.g. BTRFS or ZFS
+	parse_isolinux_config ahci0
+	# Look for partitions
+	# GPT allows more than 4 partitions, /boot on /dev/sda7 is quite unlikely but still possible
+	for j in 0 1 2 3 4 5 6 7 8 9; do parse_isolinux_config "ahci0,${j}"; done
 }
 menuentry 'Parse ISOLINUX menu (USB)  [u]' --hotkey='u' {
 	for i in 0 1; do
@@ -101,7 +97,7 @@ menuentry 'Switch to grubtest.cfg  [t]' --hotkey='t' {
 	configfile /grubtest.cfg
 }
 menuentry 'Search for GRUB configuration (grub.cfg) outside of CBFS  [s]' --hotkey='s' {
-	for i in usb0 usb1 ahci0 ahci1; do
+	for i in usb0 usb1 ahci0; do
 		for j in 1 2 3 4 5 6 7 8 9; do
 			x=${i},${j}
 			for p in "grub" "boot/grub" "grub2" "boot/grub2"; do
-- 
cgit v1.2.3-70-g09d2