diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-06-14 14:09:33 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-06-14 14:51:30 +0100 |
| commit | eb9a688ee32cf90d43fa5a15eaac686277d5f3c0 (patch) | |
| tree | b9510e6a8a988809ab7011354afe909b4ffdcef3 | |
| parent | a4328cb11f927c3cceb01dcaf4d7fc7632076119 (diff) | |
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>
| -rwxr-xr-x | script/roms | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/script/roms b/script/roms index caa37a55..3f826a1d 100755 --- a/script/roms +++ b/script/roms @@ -146,23 +146,6 @@ configure_target() [ -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" grubelf="elf/grub/$grubtree/payload/grub.elf" |