libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

roms: remove redundant check on grub_scan_disk 

the current validation check is extremely over-engineered,
because the user override is no longer available and we're
always very careful in how we modify target.cfg per board.

remove the redundant code. trust that target.cfg is correct.

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit6-merge1
Leah Rowe 2024-06-14 14:09:33 +01:00
parent a4328cb11f
commit eb9a688ee3
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
script/roms
View File

@ -146,23 +146,6 @@ configure_target()
[ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" [ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata"
eval "$(setvars "" _ata _ahci _nvme _grub_scan_disk)"
for _disk in $grub_scan_disk; do
[ "$_disk" != "nvme" ] && [ "$_disk" != "ahci" ] && \
[ "$_disk" != "ata" ] && _grub_scan_disk="nvme ahci ata" \
&& break
[ -n "$_ata" ] && [ "$_disk" = "ata" ] && continue
[ -n "$_ahci" ] && [ "$_disk" = "ahci" ] && continue
[ -n "$_nvme" ] && [ "$_disk" = "nvme" ] && continue
eval "_$_disk=\"$_disk\""
_grub_scan_disk="$_grub_scan_disk $_disk"
done
[ -z "$_grub_scan_disk" ] && _grub_scan_disk="nvme ahci ata"
grub_scan_disk="${_grub_scan_disk# }"
[ -n "$grubtree" ] || grubtree="default" [ -n "$grubtree" ] || grubtree="default"
grubelf="elf/grub/$grubtree/payload/grub.elf" grubelf="elf/grub/$grubtree/payload/grub.elf"