From: Colin Walters <walters@verbum.org>
Date: Thu, 26 Aug 2021 19:25:52 +0000 (-0400)
Subject: checkout: Also ignore xattrs for union in bare-user-only mode
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~2^2~6^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dd506fe2c8fea6bef0cd9533ac7f978eaff6f4a8;p=ostree.git

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.
---

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)