diff options
| author | Luca Bruno <luca.bruno@coreos.com> | 2021-08-27 07:34:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 07:34:46 +0000 |
| commit | cfa2aec839cfe687a2f0fe8e717af0400c20ed8e (patch) | |
| tree | e64176f1e6265b28360d3f6b949ff309dff8dc4d | |
| parent | 7fb0266df6f08d605c9a07315f4e0fcb77e57b25 (diff) | |
| parent | dd506fe2c8fea6bef0cd9533ac7f978eaff6f4a8 (diff) | |
| download | ostree-cfa2aec839cfe687a2f0fe8e717af0400c20ed8e.tar.gz | |
Merge pull request #2426 from cgwalters/xattrs-bareuseronly-union
checkout: Also ignore xattrs for union in bare-user-only mode
| -rw-r--r-- | src/libostree/ostree-repo-checkout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c index bdd93e7c..eadaf905 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) @@ -529,7 +529,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) |