From dd506fe2c8fea6bef0cd9533ac7f978eaff6f4a8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 26 Aug 2021 15:25:52 -0400 Subject: [PATCH] checkout: Also ignore xattrs for union in bare-user-only mode Followup to PRs related to https://github.com/ostreedev/ostree/issues/2410 Since the test suite now covers this the test was failing on a Fedora SELinux enabled host where we see `security.selinux` even if not in the commit. --- src/libostree/ostree-repo-checkout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c index eaa33a28..2dec8545 100644 --- a/src/libostree/ostree-repo-checkout.c +++ b/src/libostree/ostree-repo-checkout.c @@ -372,7 +372,7 @@ create_file_copy_from_input_at (OstreeRepo *repo, * checkout_file_hardlink(). */ OstreeChecksumFlags flags = 0; - if (repo->disable_xattrs) + if (repo->disable_xattrs || repo->mode == OSTREE_REPO_MODE_BARE_USER_ONLY) flags |= OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS; if (repo->mode == OSTREE_REPO_MODE_BARE_USER_ONLY) @@ -528,7 +528,7 @@ checkout_file_hardlink (OstreeRepo *self, * shouldn't hit this anymore. https://github.com/ostreedev/ostree/pull/1258 * */ OstreeChecksumFlags flags = 0; - if (self->disable_xattrs) + if (self->disable_xattrs || self->mode == OSTREE_REPO_MODE_BARE_USER_ONLY) flags |= OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS; if (self->mode == OSTREE_REPO_MODE_BARE_USER_ONLY)