Skip to content

Commit 1bc7462

Browse files
committed
xtask: Pass --filesystem to bcvk for ostree variant too
BOOTC_filesystem was silently ignored when BOOTC_variant=ostree because install_args() only emitted --filesystem inside the composefs_backend block. bcvk's --filesystem flag is not composefs-specific (the cache hash includes filesystem type and bcvk creates a fresh base disk per filesystem), so the guard was wrong. Move --filesystem before the composefs_backend block so that e.g. BOOTC_filesystem=ext4 just test-tmt-nobuild readonly actually installs on ext4, exercising the reflink-probe fallback path. Assisted-by: OpenCode (claude-sonnet-4-6@default) Signed-off-by: Colin Walters <walters@verbum.org>
1 parent 39b7b26 commit 1bc7462

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

crates/xtask/src/bcvk.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ impl BcvkInstallOpts {
6565
/// Return the install-related args for `bcvk libvirt run`.
6666
///
6767
/// This covers `--composefs-backend`, `--filesystem`, `--bootloader`,
68-
/// and `--karg` flags. Note that `--bootloader` and `--filesystem`
69-
/// are only valid when `--composefs-backend` is also set (bcvk
70-
/// enforces this via a clap `requires` relationship).
68+
/// and `--karg` flags. `--bootloader` is composefs-only, but
69+
/// `--filesystem` applies to both ostree and composefs backends.
7170
pub(crate) fn install_args(&self) -> Vec<String> {
7271
let mut args = Vec::new();
72+
if let Some(fs) = &self.filesystem {
73+
args.push(format!("--filesystem={fs}"));
74+
}
7375
if self.composefs_backend {
7476
args.push("--composefs-backend".into());
75-
let fs = self.filesystem.as_deref().unwrap_or("ext4");
76-
args.push(format!("--filesystem={fs}"));
7777
if let Some(b) = &self.bootloader {
7878
args.push(format!("--bootloader={b}"));
7979
}

0 commit comments

Comments
 (0)