From 37ebccb8a8dcadbaf7e5d83ace8cfa23bdbc2f97 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 31 Oct 2021 17:21:14 +0000
Subject: grub.cfg: don't handle usb at all in the main menuentry
usb support is extremely buggy in grub, and can cause boot delay issues
---
resources/grub/config/grub.cfg | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
(limited to 'resources/grub')
diff --git a/resources/grub/config/grub.cfg b/resources/grub/config/grub.cfg
index 83e26092..145531d4 100644
--- a/resources/grub/config/grub.cfg
+++ b/resources/grub/config/grub.cfg
@@ -124,7 +124,6 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o
#TODO: Pick better variable name scheme than ${ddev}, or find way to make it local
unset ahcidev
unset atadev
- unset usbdev
if [ (ahci?) != "(ahci?)" ]; then
ahcilist=(ahci*)
for part in ${ahcilist}; do
@@ -137,15 +136,9 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o
atadev="$part $atadev"
done
fi
- if [ (usb?) != "(usb?)" ]; then
- usblist=(usb*)
- for part in ${usblist}; do
- usbdev="$part $usbdev"
- done
- fi
set pager=0
echo -n "Attempting to cryptomount: "
- for dev in ${ahcidev} ${atadev} ${lvmvol} ${usbdev}; do # what about raid?
+ for dev in ${ahcidev} ${atadev} ${lvmvol}; do # what about raid?
echo -n "${dev} "
if cryptomount "${dev}" ; then break ; fi
done
--
cgit v1.2.1