Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions crates/kit/src/cache_metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct CacheInputs {
root_size: Option<String>,

/// Whether to use composefs-native storage
composefs_native: bool,
composefs_backend: bool,
Comment thread
cgwalters marked this conversation as resolved.

/// Kernel arguments used during installation
kernel_args: Vec<String>,
Expand All @@ -59,7 +59,7 @@ pub struct DiskImageMetadata {
pub root_size: Option<String>,

/// Whether to use composefs-native storage
pub composefs_native: bool,
pub composefs_backend: bool,
Comment thread
cgwalters marked this conversation as resolved.

/// Kernel arguments used during installation
pub kernel_args: Vec<String>,
Expand All @@ -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,
};
Expand Down Expand Up @@ -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,
}
}
}
Expand Down Expand Up @@ -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,
};

Expand Down
6 changes: 3 additions & 3 deletions crates/kit/src/install_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub struct InstallOptions {

/// Default to composefs-native storage
#[clap(long)]
pub composefs_native: bool,
pub composefs_backend: bool,
Comment thread
cgwalters marked this conversation as resolved.
}

impl InstallOptions {
Expand All @@ -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());
}
Comment thread
cgwalters marked this conversation as resolved.

args
Expand Down
2 changes: 1 addition & 1 deletion docs/src/man/bcvk-libvirt-run.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/src/man/bcvk-libvirt-upload.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/src/man/bcvk-to-disk.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ The installation process:

Set a kernel argument

**--composefs-native**
**--composefs-backend**

Default to composefs-native storage

Expand Down