From 80c7b86551f54e052852e34ac76a260dae3097f6 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters@verbum.org> Date: Wed, 30 Oct 2024 13:00:35 -0400 Subject: [PATCH] tests: Skip checking for immutable bit on composefs Needed changing after FCOS switch. Signed-off-by: Colin Walters <walters@verbum.org> --- tests/inst/src/sysroot.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/inst/src/sysroot.rs b/tests/inst/src/sysroot.rs index 6e65f35f18..9f68f15f92 100644 --- a/tests/inst/src/sysroot.rs +++ b/tests/inst/src/sysroot.rs @@ -43,6 +43,12 @@ pub(crate) fn itest_immutable_bit() -> Result<()> { if skip_non_ostree_host() { return Ok(()); } + let sh = &xshell::Shell::new()?; + let fstype = cmd!(sh, "findmnt -n -o FSTYPE /").read()?; + // If we're on composefs then we're done + if fstype.as_str() == "overlay" { + return Ok(()); + } // https://bugzilla.redhat.com/show_bug.cgi?id=1867601 cmd_has_output(sh_inline::bash_command!("lsattr -d /").unwrap(), "-i-")?; Ok(())