Merge pull request #1054 from HuijingHei/fix-update-RPi3

blockdev: support bootloader update on `MBR`

Author: cgwalters

Cargo.lock

@@ -21,8 +21,8 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = "1.0"
-bootc-internal-blockdev = "0.0.0"
-bootc-internal-utils = "0.0.0"
+bootc-internal-blockdev = "0.1.0"
+bootc-internal-utils = "0.1.0"
 cap-std-ext = "4.0.7"
 camino = "1.2.2"
 chrono = { version = "0.4.42", features = ["serde"] }

Cargo.toml

@@ -39,17 +39,10 @@ pub fn get_devices<P: AsRef<Path>>(target_root: P) -> Result<Vec<String>> {
 /// Find esp partition on the same device
 /// using sfdisk to get partitiontable
 pub fn get_esp_partition(device: &str) -> Result<Option<String>> {
-    const ESP_TYPE_GUID: &str = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B";
     let device_info: PartitionTable =
         bootc_internal_blockdev::partitions_of(Utf8Path::new(device))?;
-    let esp = device_info
-        .partitions
-        .into_iter()
-        .find(|p| p.parttype.as_str() == ESP_TYPE_GUID);
-    if let Some(esp) = esp {
-        return Ok(Some(esp.node));
-    }
-    Ok(None)
+    let esp = device_info.find_partition_of_esp()?;
+    Ok(esp.map(|v| v.node.clone()))
 }
 
 /// Find all ESP partitions on the devices

src/blockdev.rs

@@ -111,7 +111,7 @@ impl Efi {
             std::process::Command::new("mount")
                 .arg(&esp_device)
                 .arg(&mnt)
-                .run()
+                .run_inherited()
                 .with_context(|| format!("Failed to mount {:?}", esp_device))?;
             log::debug!("Mounted at {mnt:?}");
             mountpoint = Some(mnt);
@@ -139,7 +139,7 @@ impl Efi {
         if let Some(mount) = self.mountpoint.borrow_mut().take() {
             Command::new("umount")
                 .arg(&mount)
-                .run()
+                .run_inherited()
                 .with_context(|| format!("Failed to unmount {mount:?}"))?;
             log::trace!("Unmounted");
         }
@@ -688,7 +688,7 @@ pub(crate) fn clear_efi_target(target: &str) -> Result<()> {
             let mut cmd = Command::new(EFIBOOTMGR);
             cmd.args(["-b", entry.id.as_str(), "-B"]);
             println!("Executing: {cmd:?}");
-            cmd.run_with_cmd_context()?;
+            cmd.run_inherited_with_cmd_context()?;
         }
     }
 
@@ -716,7 +716,7 @@ pub(crate) fn create_efi_boot_entry(
         target,
     ]);
     println!("Executing: {cmd:?}");
-    cmd.run_with_cmd_context()
+    cmd.run_inherited_with_cmd_context()
 }
 
 #[context("Find target file recursively")]

src/efi.rs

@@ -386,7 +386,7 @@ where
             .arg(src)
             .arg(dst)
             .pre_exec(move || rustix::process::fchdir(rootfd).map_err(Into::into))
-            .run()?
+            .run_inherited()?
     };
     log::debug!("Copy {src} to {dst}");
     Ok(())

src/filetree.rs

@@ -153,7 +153,7 @@ fn write_grubenv(bootdir: &openat::Dir) -> Result<()> {
     std::process::Command::new(editenv)
         .args([GRUBENV, "create"])
         .current_dir(format!("/proc/self/fd/{}", grubdir.as_raw_fd()))
-        .run_with_cmd_context()
+        .run_inherited_with_cmd_context()
 }
 
 #[cfg(test)]