Skip to content

Commit

Permalink
efi: Allow /boot as the ESP
Browse files Browse the repository at this point in the history
Some systems use the ESP as the entire `/boot` filesystem. This check
needs to go before `boot/efi` since that would also detect the FAT
filesystem but would expect the `EFI` directory at `/boot/efi/EFI`
instead of `/boot/EFI`. A more typical system with the ESP mounted at
`/boot/efi` would not have use FAT for the `/boot` filesystem and would
be skipped in this check.
  • Loading branch information
dbnicholson committed Apr 11, 2023
1 parent f70a264 commit c7dd388
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/efi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use crate::util;
use crate::util::CommandRunExt;

/// Well-known paths to the ESP that may have been mounted external to us.
pub(crate) const ESP_MOUNTS: &[&str] = &["boot/efi", "efi"];
pub(crate) const ESP_MOUNTS: &[&str] = &["boot", "boot/efi", "efi"];

/// The ESP partition label on Fedora CoreOS derivatives
pub(crate) const COREOS_ESP_PART_LABEL: &str = "EFI-SYSTEM";
Expand Down

0 comments on commit c7dd388

Please sign in to comment.