Skip to content

Commit 5ac2788

Browse files
committed
efi: clarify function purpose by renaming validate_esp() to
`validate_esp_fstype()`
1 parent b525379 commit 5ac2788

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/efi.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ impl Component for Efi {
271271

272272
let destdir = &openat::Dir::open(&destpath.join("EFI"))
273273
.with_context(|| format!("opening EFI dir {}", destpath.display()))?;
274-
validate_esp(&destdir)?;
274+
validate_esp_fstype(&destdir)?;
275275
let updated = rootcxt
276276
.sysroot
277277
.sub_dir(&component_updatedirname(self))
@@ -312,7 +312,7 @@ impl Component for Efi {
312312

313313
let destd = &openat::Dir::open(destpath)
314314
.with_context(|| format!("opening dest dir {}", destpath.display()))?;
315-
validate_esp(destd)?;
315+
validate_esp_fstype(destd)?;
316316

317317
// TODO - add some sort of API that allows directly setting the working
318318
// directory to a file descriptor.
@@ -368,7 +368,7 @@ impl Component for Efi {
368368

369369
let destdir = &openat::Dir::open(&destpath.join("EFI"))
370370
.with_context(|| format!("opening EFI dir {}", destpath.display()))?;
371-
validate_esp(&destdir)?;
371+
validate_esp_fstype(&destdir)?;
372372
log::trace!("applying diff: {}", &diff);
373373
filetree::apply_diff(&updated, &destdir, &diff, None)
374374
.context("applying filesystem changes")?;
@@ -492,7 +492,7 @@ impl Drop for Efi {
492492
}
493493
}
494494

495-
fn validate_esp(dir: &openat::Dir) -> Result<()> {
495+
fn validate_esp_fstype(dir: &openat::Dir) -> Result<()> {
496496
let dir = unsafe { BorrowedFd::borrow_raw(dir.as_raw_fd()) };
497497
let stat = rustix::fs::fstatfs(&dir)?;
498498
if stat.f_type != libc::MSDOS_SUPER_MAGIC {

0 commit comments

Comments
 (0)