Merge branch 'master' of specing/libreboot into master

1 files changed, 3 insertions, 3 deletions

diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index d65f86fb..59e1e32e 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -64,13 +64,13 @@ menuentry 'Load Operating System (incl. fully encrypted disks)  [o]' --hotkey='o
 # on raw crypto devices as well as inside LVM volumes this time.
 
 #	The user will be prompted for a passphrase if a LUKS header was found.
-	for dev in ahci0 ata0 usb0 ${lvm}; do
+	for dev usb1 usb0 ahci1 ahci0 ata1 ata0 ${lvm}; do
 		cryptomount "(${dev})"
 	done
 #	3) encrypted devices/partitions
-	for i in 0 1; do
+	for i in 1 0; do
 		for part in 1 2 3 4 5; do
-            for type in ahci ata; do
+            for type in usb ahci ata; do
     			cryptomount "(${type}${i},${part})"
             done
 		done