From a260687a409c27f3e0dda9a9af0182166be0283f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 3 Nov 2025 07:17:54 -0500 Subject: [PATCH] install: Rename composefs-native -> composefs-backend This is how the option is called in latest bootc. Closes: https://github.com/bootc-dev/bcvk/issues/117 Signed-off-by: Colin Walters --- crates/kit/src/cache_metadata.rs | 10 +++++----- crates/kit/src/install_options.rs | 6 +++--- docs/src/man/bcvk-libvirt-run.md | 2 +- docs/src/man/bcvk-libvirt-upload.md | 2 +- docs/src/man/bcvk-to-disk.md | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/kit/src/cache_metadata.rs b/crates/kit/src/cache_metadata.rs index db7607042..70ab0ba6c 100644 --- a/crates/kit/src/cache_metadata.rs +++ b/crates/kit/src/cache_metadata.rs @@ -37,7 +37,7 @@ struct CacheInputs { root_size: Option, /// Whether to use composefs-native storage - composefs_native: bool, + composefs_backend: bool, /// Kernel arguments used during installation kernel_args: Vec, @@ -59,7 +59,7 @@ pub struct DiskImageMetadata { pub root_size: Option, /// Whether to use composefs-native storage - pub composefs_native: bool, + pub composefs_backend: bool, /// Kernel arguments used during installation pub kernel_args: Vec, @@ -75,7 +75,7 @@ impl DiskImageMetadata { image_digest: self.digest.clone(), filesystem: self.filesystem.clone(), root_size: self.root_size.clone(), - composefs_native: self.composefs_native, + composefs_backend: self.composefs_backend, kernel_args: self.kernel_args.clone(), version: self.version, }; @@ -160,7 +160,7 @@ impl DiskImageMetadata { filesystem: options.filesystem.clone(), root_size: options.root_size.clone(), kernel_args: options.karg.clone(), - composefs_native: options.composefs_native, + composefs_backend: options.composefs_backend, } } } @@ -291,7 +291,7 @@ mod tests { filesystem: Some("ext4".to_string()), root_size: Some("20G".to_string()), kernel_args: vec!["console=ttyS0".to_string()], - composefs_native: false, + composefs_backend: false, version: 1, }; diff --git a/crates/kit/src/install_options.rs b/crates/kit/src/install_options.rs index 961d83e95..db0eaca32 100644 --- a/crates/kit/src/install_options.rs +++ b/crates/kit/src/install_options.rs @@ -35,7 +35,7 @@ pub struct InstallOptions { /// Default to composefs-native storage #[clap(long)] - pub composefs_native: bool, + pub composefs_backend: bool, } impl InstallOptions { @@ -57,8 +57,8 @@ impl InstallOptions { args.push(format!("--karg={k}")); } - if self.composefs_native { - args.push("--composefs-native".to_owned()); + if self.composefs_backend { + args.push("--composefs-backend".to_owned()); } args diff --git a/docs/src/man/bcvk-libvirt-run.md b/docs/src/man/bcvk-libvirt-run.md index 1db781f74..f577160f3 100644 --- a/docs/src/man/bcvk-libvirt-run.md +++ b/docs/src/man/bcvk-libvirt-run.md @@ -57,7 +57,7 @@ Run a bootable container as a persistent VM Set a kernel argument -**--composefs-native** +**--composefs-backend** Default to composefs-native storage diff --git a/docs/src/man/bcvk-libvirt-upload.md b/docs/src/man/bcvk-libvirt-upload.md index 610a1e945..c7ab10adc 100644 --- a/docs/src/man/bcvk-libvirt-upload.md +++ b/docs/src/man/bcvk-libvirt-upload.md @@ -49,7 +49,7 @@ Upload bootc disk images to libvirt with metadata annotations Set a kernel argument -**--composefs-native** +**--composefs-backend** Default to composefs-native storage diff --git a/docs/src/man/bcvk-to-disk.md b/docs/src/man/bcvk-to-disk.md index c6209f554..833669b88 100644 --- a/docs/src/man/bcvk-to-disk.md +++ b/docs/src/man/bcvk-to-disk.md @@ -51,7 +51,7 @@ The installation process: Set a kernel argument -**--composefs-native** +**--composefs-backend** Default to composefs-native storage