Merge pull request containers#569 from cgwalters/no-firmware-no-efivars

efi: Only try to update firmware if booted via EFI
cgwalters · Nov 19, 2023 · ad66260 · ad66260
2 parents 3dad8d4 + 9bae8e6
commit ad66260
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/efi.rs b/src/efi.rs
@@ -128,6 +128,10 @@ impl Efi {
 
     #[context("Updating EFI firmware variables")]
     fn update_firmware(&self, device: &str, espdir: &openat::Dir) -> Result<()> {
+        if !is_efi_booted()? {
+            log::debug!("Not booted via EFI, skipping firmware update");
+            return Ok(());
+        }
         let efidir = &espdir.sub_dir("EFI").context("Opening EFI")?;
         let vendordir = super::grubconfigs::find_efi_vendordir(efidir)?;
         let vendordir = vendordir