to-disk: Add --install-log

To help debug installs.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

crates/kit/src/libvirt/run.rs

@@ -144,6 +144,7 @@ pub fn run(global_opts: &crate::libvirt::LibvirtOptions, opts: LibvirtRunOpts) -
             disk_size: Some(opts.disk_size.clone()),
             format: crate::to_disk::Format::Raw, // Default to raw format
             install: opts.install.clone(),
+            install_log: None,
             common: CommonVmOpts {
                 memory: opts.memory.clone(),
                 vcpus: Some(opts.cpus),

crates/kit/src/libvirt/upload.rs

@@ -217,6 +217,7 @@ pub fn run(global_opts: &crate::libvirt::LibvirtOptions, opts: LibvirtUploadOpts
         format: crate::to_disk::Format::Raw, // Default to raw format
         disk_size: Some(disk_size.to_string()),
         label: Default::default(),
+        install_log: None,
         common: crate::run_ephemeral::CommonVmOpts {
             memory: opts.memory.clone(),
             vcpus: opts.vcpus,

crates/kit/src/libvirt_upload_disk.rs

@@ -288,6 +288,7 @@ pub fn run(opts: LibvirtUploadDiskOpts) -> Result<()> {
         disk_size: Some(disk_size.to_string()),
         format: crate::to_disk::Format::Raw, // Default to raw format
         label: Default::default(),
+        install_log: None,
         common: crate::run_ephemeral::CommonVmOpts {
             memory: opts.memory.clone(),
             vcpus: opts.vcpus,

crates/kit/src/to_disk.rs

@@ -139,6 +139,10 @@ pub struct ToDiskOpts {
     #[clap(flatten)]
     pub common: CommonVmOpts,
 
+    /// Configure logging for `bootc install` by setting the `RUST_LOG` environment variable.
+    #[clap(long)]
+    pub install_log: Option<String>,
+
     #[clap(
         long = "label",
         help = "Add metadata to the container in key=value form"
@@ -184,6 +188,14 @@ impl ToDiskOpts {
             .map_err(|e| eyre!("Failed to quote source imgref '{}': {}", source_imgref, e))?
             .to_string();
 
+        let install_log = self
+            .install_log
+            .as_deref()
+            .map(|v| shlex::try_quote(v))
+            .transpose()?
+            .map(|v| format!("RUST_LOG={v}"))
+            .unwrap_or_default();
+
         // Create the complete script by substituting variables directly
         let script = indoc! {r#"
             set -euo pipefail
@@ -198,6 +210,7 @@ impl ToDiskOpts {
 
             # Execute bootc installation
             env STORAGE_OPTS=additionalimagestore=/run/virtiofs-mnt-hoststorage/ \
+                {INSTALL_LOG} \
                 bootc install to-disk \
                 --generic-image \
                 --skip-fetch-check \
@@ -208,6 +221,7 @@ impl ToDiskOpts {
             echo "Installation completed successfully!"
         "#}
         .replace("{SOURCE_IMGREF}", &quoted_source_imgref)
+        .replace("{INSTALL_LOG}", &install_log)
         .replace("{BOOTC_ARGS}", &bootc_args);
 
         Ok(vec!["/bin/bash".to_string(), "-c".to_string(), script])
@@ -492,6 +506,7 @@ mod tests {
             source_image: "test:latest".to_string(),
             target_disk: "/tmp/test.img".into(),
             label: Default::default(),
+            install_log: None,
             install: InstallOptions {
                 filesystem: Some("ext4".to_string()),
                 ..Default::default()
@@ -510,6 +525,7 @@ mod tests {
             source_image: "test:latest".to_string(),
             target_disk: "/tmp/test.img".into(),
             label: Default::default(),
+            install_log: None,
             install: InstallOptions {
                 filesystem: Some("ext4".to_string()),
                 ..Default::default()

docs/src/man/bcvk-to-disk.md

@@ -103,6 +103,10 @@ The installation process:
 
     Generate SSH keypair and inject via systemd credentials
 
+**--install-log**=*INSTALL_LOG*
+
+    Configure logging for `bootc install` by setting the `RUST_LOG` environment variable
+
 **--label**=*LABEL*
 
     Add metadata to the container in key=value form