diff options
| author | Luca BRUNO <luca.bruno@coreos.com> | 2021-08-23 13:08:44 +0000 |
|---|---|---|
| committer | Luca BRUNO <luca.bruno@coreos.com> | 2021-08-24 07:56:46 +0000 |
| commit | 3e2360e3bba6c215acccc77373d01a5674c770e6 (patch) | |
| tree | 7faf2b946d8fdc5067232bb59565aefdfbfc196b | |
| parent | f75552e15ca1afb3ed05b3d16abfcb1e9de3c57d (diff) | |
| download | ostree-3e2360e3bba6c215acccc77373d01a5674c770e6.tar.gz | |
lib/commit: automatically skip xattrs in bare-user-only mode
| -rw-r--r-- | src/libostree/ostree-repo-commit.c | 5 | ||||
| -rw-r--r-- | src/libostree/ostree-repo.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index 249e792c..d5ab57a2 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -3382,8 +3382,9 @@ get_final_xattrs (OstreeRepo *self, /* track whether the returned xattrs differ from the file on disk */ gboolean modified = TRUE; const gboolean skip_xattrs = (modifier && - modifier->flags & (OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS | - OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS)) > 0; + (modifier->flags & (OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS | + OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS)) > 0) || + self->mode == OSTREE_REPO_MODE_BARE_USER_ONLY; /* fetch on-disk xattrs if needed & not disabled */ g_autoptr(GVariant) original_xattrs = NULL; diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h index bbec1a37..962fa8cc 100644 --- a/src/libostree/ostree-repo.h +++ b/src/libostree/ostree-repo.h @@ -684,7 +684,7 @@ typedef OstreeRepoCommitFilterResult (*OstreeRepoCommitFilter) (OstreeRepo *r * @OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL: If a devino cache hit is found, skip modifier filters (non-directories only); Since: 2017.14 * * Flags modifying commit behavior. In bare-user-only mode, @OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS - * is automatically enabled. + * and @OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS are automatically enabled. * */ typedef enum { |