Skip to content

Commit e170ed4

Browse files
committed
install: Rename composefs-native -> composefs-backend
This is how the option is called in latest bootc. Closes: #117 Signed-off-by: Colin Walters <[email protected]>
1 parent 2ccd485 commit e170ed4

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

crates/kit/src/cache_metadata.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct CacheInputs {
3737
root_size: Option<String>,
3838

3939
/// Whether to use composefs-native storage
40-
composefs_native: bool,
40+
composefs_backend: bool,
4141

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

6161
/// Whether to use composefs-native storage
62-
pub composefs_native: bool,
62+
pub composefs_backend: bool,
6363

6464
/// Kernel arguments used during installation
6565
pub kernel_args: Vec<String>,
@@ -75,7 +75,7 @@ impl DiskImageMetadata {
7575
image_digest: self.digest.clone(),
7676
filesystem: self.filesystem.clone(),
7777
root_size: self.root_size.clone(),
78-
composefs_native: self.composefs_native,
78+
composefs_backend: self.composefs_backend,
7979
kernel_args: self.kernel_args.clone(),
8080
version: self.version,
8181
};
@@ -160,7 +160,7 @@ impl DiskImageMetadata {
160160
filesystem: options.filesystem.clone(),
161161
root_size: options.root_size.clone(),
162162
kernel_args: options.karg.clone(),
163-
composefs_native: options.composefs_native,
163+
composefs_backend: options.composefs_backend,
164164
}
165165
}
166166
}
@@ -291,7 +291,7 @@ mod tests {
291291
filesystem: Some("ext4".to_string()),
292292
root_size: Some("20G".to_string()),
293293
kernel_args: vec!["console=ttyS0".to_string()],
294-
composefs_native: false,
294+
composefs_backend: false,
295295
version: 1,
296296
};
297297

crates/kit/src/install_options.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub struct InstallOptions {
3535

3636
/// Default to composefs-native storage
3737
#[clap(long)]
38-
pub composefs_native: bool,
38+
pub composefs_backend: bool,
3939
}
4040

4141
impl InstallOptions {
@@ -57,8 +57,8 @@ impl InstallOptions {
5757
args.push(format!("--karg={k}"));
5858
}
5959

60-
if self.composefs_native {
61-
args.push("--composefs-native".to_owned());
60+
if self.composefs_backend {
61+
args.push("--composefs-backend".to_owned());
6262
}
6363

6464
args

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Run a bootable container as a persistent VM
6161

6262
Set a kernel argument
6363

64-
**--composefs-native**
64+
**--composefs-backend**
6565

6666
Default to composefs-native storage
6767

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Upload bootc disk images to libvirt with metadata annotations
4949

5050
Set a kernel argument
5151

52-
**--composefs-native**
52+
**--composefs-backend**
5353

5454
Default to composefs-native storage
5555

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The installation process:
5151

5252
Set a kernel argument
5353

54-
**--composefs-native**
54+
**--composefs-backend**
5555

5656
Default to composefs-native storage
5757

0 commit comments

Comments
 (0)