to-disk: Add --composefs-native

Mirroring the bootc option.

Though I'm trying to get rid of this and have it be autodetected.

Signed-off-by: Colin Walters <walters@verbum.org>

Author: cgwalters

crates/kit/src/install_options.rs

@@ -12,7 +12,7 @@ use clap::Parser;
 /// These options control filesystem configuration and storage paths
 /// for bootc installation commands. Use `#[clap(flatten)]` to include
 /// these in command-specific option structures.
-#[derive(Debug, Parser, Clone)]
+#[derive(Debug, Default, Parser, Clone)]
 pub struct InstallOptions {
     /// Root filesystem type (overrides bootc image default)
     #[clap(long, help = "Root filesystem type (e.g. ext4, xfs, btrfs)")]
@@ -28,6 +28,10 @@ pub struct InstallOptions {
         help = "Path to host container storage (auto-detected if not specified)"
     )]
     pub storage_path: Option<Utf8PathBuf>,
+
+    /// Default to composefs-native storage
+    #[clap(long)]
+    pub composefs_native: bool,
 }
 
 impl InstallOptions {
@@ -45,6 +49,10 @@ impl InstallOptions {
             args.push(root_size.clone());
         }
 
+        if self.composefs_native {
+            args.push("--composefs-native".to_owned());
+        }
+
         args
     }
 }

crates/kit/src/libvirt/run.rs

@@ -139,8 +139,7 @@ pub fn run(global_opts: &crate::libvirt::LibvirtOptions, opts: LibvirtRunOpts) -
             format: crate::to_disk::Format::Raw, // Default to raw format
             install: InstallOptions {
                 filesystem: Some(opts.filesystem.clone()),
-                root_size: None,
-                storage_path: None,
+                ..Default::default()
             },
             common: CommonVmOpts {
                 memory: opts.memory.clone(),

crates/kit/src/to_disk.rs

@@ -490,8 +490,7 @@ mod tests {
             label: Default::default(),
             install: InstallOptions {
                 filesystem: Some("ext4".to_string()),
-                root_size: None,
-                storage_path: None,
+                ..Default::default()
             },
             disk_size: Some("10G".to_string()),
             format: Format::Raw,
@@ -509,8 +508,7 @@ mod tests {
             label: Default::default(),
             install: InstallOptions {
                 filesystem: Some("ext4".to_string()),
-                root_size: None,
-                storage_path: None,
+                ..Default::default()
             },
             disk_size: Some("5120M".to_string()),
             format: Format::Raw,

docs/src/man/bcvk-libvirt-create.md

@@ -81,6 +81,10 @@ Create and start domains from uploaded bootc volumes
 
     Path to host container storage (auto-detected if not specified)
 
+**--composefs-native**
+
+    Default to composefs-native storage
+
 **--disk-size**=*DISK_SIZE*
 
     Size of the disk image for automatic upload (e.g., '20G', '10240M')

docs/src/man/bcvk-libvirt-upload.md

@@ -45,6 +45,10 @@ Upload bootc disk images to libvirt with metadata annotations
 
     Path to host container storage (auto-detected if not specified)
 
+**--composefs-native**
+
+    Default to composefs-native storage
+
 **--memory**=*MEMORY*
 
     Memory size (e.g. 4G, 2048M, or plain number for MB)

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

@@ -47,6 +47,10 @@ The installation process:
 
     Path to host container storage (auto-detected if not specified)
 
+**--composefs-native**
+
+    Default to composefs-native storage
+
 **--disk-size**=*DISK_SIZE*
 
     Disk size to create (e.g. 10G, 5120M, or plain number for bytes)