packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Colin Walters 2021-08-26 15:25:52 -04:00
parent 28a0792919
commit dd506fe2c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-repo-checkout.c
View File

@ -372,7 +372,7 @@ create_file_copy_from_input_at (OstreeRepo *repo,
* checkout_file_hardlink(). * checkout_file_hardlink().
*/ */
OstreeChecksumFlags flags = 0; 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; flags |= OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS;
if (repo->mode == OSTREE_REPO_MODE_BARE_USER_ONLY) 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 * shouldn't hit this anymore. https://github.com/ostreedev/ostree/pull/1258
* */ * */
OstreeChecksumFlags flags = 0; 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; flags |= OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS;
if (self->mode == OSTREE_REPO_MODE_BARE_USER_ONLY) if (self->mode == OSTREE_REPO_MODE_BARE_USER_ONLY)