From bd376eb0436ce79d663eb53719288f8dd3417dbc Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 11 Oct 2024 19:39:32 +0000 Subject: [PATCH] kargs: Skip xattrs in tests This breaks in situations where `/tmp` is on e.g. overlayfs which sadly is the podman/docker default. Signed-off-by: Colin Walters --- lib/src/kargs.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/src/kargs.rs b/lib/src/kargs.rs index 6f6bdec4..07743e5f 100644 --- a/lib/src/kargs.rs +++ b/lib/src/kargs.rs @@ -277,8 +277,16 @@ match-architectures = ["x86_64", "aarch64"] let txn = repo.auto_transaction(cancellable)?; let mt = ostree::MutableTree::new(); - repo.write_dfd_to_mtree(d.as_fd().as_raw_fd(), path.as_str(), &mt, None, cancellable) - .context("Writing merged filesystem to mtree")?; + let commitmod_flags = ostree::RepoCommitModifierFlags::SKIP_XATTRS; + let commitmod = ostree::RepoCommitModifier::new(commitmod_flags, None); + repo.write_dfd_to_mtree( + d.as_fd().as_raw_fd(), + path.as_str(), + &mt, + Some(&commitmod), + cancellable, + ) + .context("Writing merged filesystem to mtree")?; let merged_root = repo .write_mtree(&mt, cancellable)