From ad87e84ae18c5541cf84c2ff4b3218a054ab4fbe Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 30 Oct 2021 16:13:27 +0100
Subject: grub.cfg: also unroll the list of usb devices

---
 resources/grub/config/grub.cfg | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/grub/config/grub.cfg b/resources/grub/config/grub.cfg
index d56732ed..c9232c3b 100644
--- a/resources/grub/config/grub.cfg
+++ b/resources/grub/config/grub.cfg
@@ -117,7 +117,7 @@ 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
+	unset usbdev
 	if [ (ahci?) != "(ahci?)" ]; then
 		ahcilist=(ahci*)
 		for part in ${ahcilist}; do
@@ -131,7 +131,10 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 		done
 	fi
 	if [ (usb?) != "(usb?)" ]; then
-		usbdev=(usb*)
+		usblist=(usb*)
+		for part in ${usblist}; do
+	        	usbdev="$part $usbdev"
+		done
 	fi
 	set pager=0
 	echo -n "Attempting to cryptomount: "
-- 
cgit v1.2.1