summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2021-10-31 17:14:41 +0000
committerLeah Rowe <leah@libreboot.org>2021-10-31 17:14:41 +0000
commit7c998b45385393f12cf27e54dcbcb810f7bf450a (patch)
tree4b87226a6de818780c6ce259f761863d8d34cdc0
parent62fa042a17846f1619f257f878b928364d96b3a8 (diff)
grub.cfg: search usb *last*, in the main menuentry
There is already a separate menuentry for USB, and most people don't boot their installed system from USB anyway. This will result in faster boot speeds.
-rw-r--r--resources/grub/config/grub.cfg6
1 files changed, 3 insertions, 3 deletions
diff --git a/resources/grub/config/grub.cfg b/resources/grub/config/grub.cfg
index 7d889989..8a880f9a 100644
--- a/resources/grub/config/grub.cfg
+++ b/resources/grub/config/grub.cfg
@@ -97,9 +97,9 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o
# unnecessary decryption routines in the following order:
# 1) raw devices and MBR/GPT partitions
- search_grub usb
search_grub ahci
- search_grub ata
+ search_grub ata
+ search_grub usb
# 2) LVM and RAID which might be used accross multiple devices
unset lvmvol
for vol in bootvol rootvol; do
@@ -146,7 +146,7 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o
fi
set pager=0
echo -n "Attempting to cryptomount: "
- for dev in ${usbdev} ${ahcidev} ${atadev} ${lvmvol}; do # what about raid?
+ for dev in ${ahcidev} ${atadev} ${lvmvol} ${usbdev}; do # what about raid?
echo -n "${dev} "
if cryptomount "${dev}" ; then break ; fi
done