keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ex-container: Always use canonical permissions for commit

Browse Source 
Fixes a fsck issue that I saw while submitting another patch.

This is the second time in the last week I've fixed an issue like this; will
probably do a libostree patch to just turn it on by default for
`bare-user-only`, but let's fix this bug anyways.

Closes: #1071
Approved by: peterbaouoft
This commit is contained in:
Colin Walters 2017-10-22 11:04:53 -04:00 committed by Atomic Bot
parent a9c8b1fae1
commit 5da2894823
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libpriv/rpmostree-core.c
View File

@ -3479,9 +3479,12 @@ rpmostree_context_commit_tmprootfs (RpmOstreeContext *self,
"rpmostree.state-sha512",
g_variant_new_string (state_checksum));
commit_modifier =
ostree_repo_commit_modifier_new (OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE,
NULL, NULL, NULL);
OstreeRepoCommitModifierFlags modflags = OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE;
/* For ex-container (bare-user-only), we always need canonical permissions */
if (ostree_repo_get_mode (self->ostreerepo) == OSTREE_REPO_MODE_BARE_USER_ONLY)
modflags |= OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS;
commit_modifier = ostree_repo_commit_modifier_new (modflags, NULL, NULL, NULL);
ostree_repo_commit_modifier_set_devino_cache (commit_modifier, devino_cache);