Skip to content

Commit

Permalink
checkout: Also ignore xattrs for union in bare-user-only mode
Browse files Browse the repository at this point in the history
Followup to PRs related to ostreedev#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.
  • Loading branch information
cgwalters committed Aug 26, 2021
1 parent 28a0792 commit dd506fe
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libostree/ostree-repo-checkout.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit dd506fe

Please sign in to comment.