install: Fix composefs Repository import and borrow checker errors

- Use correct path composefs::repository::Repository instead of composefs::Repository
- Remove unused read_file import from composefs::fs
- Remove unused Read and Write imports from std::io
- Fix temporary value dropped while borrowed error in install_bootloader by using a let binding

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Signed-off-by: Eric Curtin <eric.curtin@docker.com>

Author: ericcurtin

Cargo.lock

@@ -44,10 +44,11 @@ clap_mangen = { version = "0.2.20" }
 # If adding/removing crates here, also update docs/Dockerfile.mdbook and docs/src/internals.md.
 #
 # To develop against a local composefs-rs checkout, add a [patch] section at the end of this file:
-#   [patch."https://github.com/containers/composefs-rs"]
+#   [patch."https://github.com/composefs/composefs-rs"]
 #   composefs = { path = "/home/user/src/composefs-rs/crates/composefs" }
 #   composefs-boot = { path = "/home/user/src/composefs-rs/crates/composefs-boot" }
 #   composefs-oci = { path = "/home/user/src/composefs-rs/crates/composefs-oci" }
+#   cfsctl = { path = "/home/user/src/composefs-rs/crates/cfsctl" }
 # The Justfile will auto-detect these and bind-mount them into container builds.
 composefs = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "composefs", features = ["rhel9"] }
 cfsctl = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "cfsctl", features = ["rhel9"] }

Cargo.toml

@@ -26,6 +26,3 @@ tracing = { workspace = true }
 
 [dev-dependencies]
 indoc = { workspace = true }
-
-[lib]
-path = "src/blockdev.rs"

crates/blockdev/Cargo.toml

@@ -1,3 +1,11 @@
+//! Block device utilities for bootc.
+//!
+//! This module provides utilities for querying and managing block devices,
+//! partitions, and filesystems during bootc installation and operation.
+
+// Allow unsafe code for prctl FFI declaration
+#![allow(unsafe_code)]
+
 use std::env;
 use std::path::Path;
 use std::process::{Command, Stdio};
@@ -10,6 +18,14 @@ use serde::Deserialize;
 
 use bootc_utils::CommandRunExt;
 
+// prctl constants and extern declaration for parent death signal
+// PR_SET_PDEATHSIG = 1
+const PR_SET_PDEATHSIG: libc::c_int = 1;
+
+unsafe extern "C" {
+    fn prctl(option: libc::c_int, arg2: libc::c_ulong) -> libc::c_int;
+}
+
 /// MBR partition type IDs that indicate an EFI System Partition.
 /// 0x06 is FAT16 (used as ESP on some MBR systems), 0xEF is the
 /// explicit EFI System Partition type.
@@ -26,27 +42,41 @@ struct DevicesOutput {
 
 #[allow(dead_code)]
 #[derive(Debug, Clone, Deserialize)]
+/// Information about a block device.
 pub struct Device {
+    /// Device name (e.g., "sda", "sda1").
     pub name: String,
+    /// Device serial number.
     pub serial: Option<String>,
+    /// Device model.
     pub model: Option<String>,
+    /// Partition label.
     pub partlabel: Option<String>,
+    /// Partition type.
     pub parttype: Option<String>,
+    /// Partition UUID.
     pub partuuid: Option<String>,
     /// Partition number (1-indexed). None for whole disk devices.
     pub partn: Option<u32>,
+    /// Child devices (partitions for a disk).
     pub children: Option<Vec<Device>>,
+    /// Device size in bytes.
     pub size: u64,
+    /// Major:minor device numbers.
     #[serde(rename = "maj:min")]
     pub maj_min: Option<String>,
     // NOTE this one is not available on older util-linux, and
     // will also not exist for whole blockdevs (as opposed to partitions).
     pub start: Option<u64>,
 
     // Filesystem-related properties
+    /// Filesystem label.
     pub label: Option<String>,
+    /// Filesystem type.
     pub fstype: Option<String>,
+    /// Filesystem UUID.
     pub uuid: Option<String>,
+    /// Device path.
     pub path: Option<String>,
     /// Partition table type (e.g., "gpt", "dos"). Only present on whole disk devices.
     pub pttype: Option<String>,
@@ -234,6 +264,7 @@ impl Device {
     }
 }
 
+/// List information about a block device.
 #[context("Listing device {dev}")]
 pub fn list_dev(dev: &Utf8Path) -> Result<Device> {
     let mut devs: DevicesOutput = Command::new("lsblk")
@@ -256,7 +287,9 @@ pub fn list_dev_by_dir(dir: &Dir) -> Result<Device> {
     list_dev(&Utf8PathBuf::from(&fsinfo.source))
 }
 
+/// A loopback block device backed by a file.
 pub struct LoopbackDevice {
+    /// The loopback device path (e.g., "/dev/loop0").
     pub dev: Option<Utf8PathBuf>,
     // Handle to the cleanup helper process
     cleanup_handle: Option<LoopbackCleanupHandle>,
@@ -384,17 +417,25 @@ impl Drop for LoopbackDevice {
     }
 }
 
-/// Main function for the loopback cleanup helper process
-/// This function does not return - it either exits normally or via signal
+/// Run the loopback cleanup helper process.
+///
+/// This function does not return - it either exits normally or via signal.
+/// It is used to clean up loopback devices when the parent process dies.
 pub async fn run_loopback_cleanup_helper(device_path: &str) -> Result<()> {
     // Check if we're running as a cleanup helper
     if std::env::var("BOOTC_LOOPBACK_CLEANUP_HELPER").is_err() {
         anyhow::bail!("This function should only be called as a cleanup helper");
     }
 
     // Set up death signal notification - we want to be notified when parent dies
-    rustix::process::set_parent_process_death_signal(Some(rustix::process::Signal::TERM))
-        .context("Failed to set parent death signal")?;
+    // Use prctl directly via libc since rustix removed this API
+    unsafe {
+        // SIGTERM = 15
+        let ret = prctl(PR_SET_PDEATHSIG, libc::SIGTERM as libc::c_ulong);
+        if ret != 0 {
+            return Err(std::io::Error::last_os_error()).context("Failed to set parent death signal");
+        }
+    }
 
     // Wait for SIGTERM (either from parent death or normal cleanup)
     tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
@@ -434,7 +475,9 @@ pub async fn run_loopback_cleanup_helper(device_path: &str) -> Result<()> {
     }
 }
 
-/// Parse a string into mibibytes
+/// Parse a size string into mebibytes.
+///
+/// Supports suffixes: MiB/M, GiB/G, TiB/T.
 pub fn parse_size_mib(mut s: &str) -> Result<u64> {
     let suffixes = [
         ("MiB", 1u64),

crates/blockdev/src/blockdev.rs

@@ -0,0 +1,7 @@
+//! Internal block device handling utilities for bootc.
+//!
+//! This crate provides utilities for querying and managing block devices,
+//! partitions, and filesystems during bootc installation and operation.
+
+mod blockdev;
+pub use blockdev::*;

crates/blockdev/src/lib.rs

@@ -173,7 +173,7 @@ use cap_std_ext::cap_tempfile::TempDir;
 use cap_std_ext::cmdext::CapStdExtCommandExt;
 use cap_std_ext::prelude::CapStdExtDirExt;
 use clap::ValueEnum;
-use composefs::fs::{read_file, write_to_path};
+use composefs::fs::write_to_path;
 use composefs_boot::bootloader::{BootEntry, get_boot_resources};
 use composefs_boot::selabel;
 use composefs_oci::image::create_filesystem as create_composefs_filesystem;
@@ -1912,11 +1912,12 @@ fn install_bootloader(
     deployment_path: Option<&str>,
     bootloader_override: Option<&Bootloader>,
 ) -> Result<()> {
+    let default_bootloader = Bootloader::default();
     let bootloader = bootloader_override.unwrap_or(
         &config_opts
             .bootloader
-            .clone()
-            .unwrap_or(Bootloader::default()),
+            .as_ref()
+            .unwrap_or(&default_bootloader),
     );
 
     match bootloader {
@@ -2028,12 +2029,11 @@ fn create_flat_bls_entry(
 #[context("Copying regular file to {dest_path}")]
 fn copy_regular_file<ObjectID: FsVerityHashValue>(
     file: &composefs::tree::RegularFile<ObjectID>,
-    repo: &composefs::Repository<ObjectID>,
+    repo: &composefs::repository::Repository<ObjectID>,
     dest_dir: &Dir,
     dest_path: &str,
 ) -> Result<()> {
     use composefs::tree::RegularFile;
-    use std::io::{Read, Write};
 
     match file {
         RegularFile::Inline(data) => {

crates/lib/src/install.rs

@@ -25,6 +25,3 @@ cap-std-ext = { workspace = true }
 
 [dev-dependencies]
 indoc = { workspace = true }
-
-[lib]
-path = "src/mount.rs"

crates/mount/Cargo.toml

@@ -0,0 +1,10 @@
+//! Internal mount utilities for bootc.
+//!
+//! This crate provides utilities for mounting and managing filesystem mounts
+//! during bootc installation and operation.
+
+mod mount;
+pub use mount::*;
+
+mod tempmount;
+pub use tempmount::*;

crates/mount/src/lib.rs

@@ -23,8 +23,6 @@ use rustix::{
 };
 use serde::Deserialize;
 
-pub mod tempmount;
-
 /// Well known identifier for pid 1
 pub const PID1: Pid = const {
     match Pid::from_raw(1) {

crates/mount/src/mount.rs

@@ -1,3 +1,8 @@
+//! Temporary mount management utilities.
+//!
+//! This module provides the [`TempMount`] type for creating temporary mounts
+//! that are automatically unmounted when dropped.
+
 use std::os::fd::AsFd;
 
 use anyhow::{Context, Result};
@@ -7,8 +12,11 @@ use cap_std_ext::cap_std::{ambient_authority, fs::Dir};
 use fn_error_context::context;
 use rustix::mount::{MountFlags, MoveMountFlags, UnmountFlags, move_mount, unmount};
 
+/// A temporary mount that is automatically unmounted when dropped.
 pub struct TempMount {
+    /// The temporary directory used as the mount point.
     pub dir: tempfile::TempDir,
+    /// The directory file descriptor for the mount.
     pub fd: Dir,
 }