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

compose: Do relabel before downloading in --ex-unified-core

Browse Source 
We removed this in review, but I rediscovered why I added it.  We
fail the `g_assert (sepolicy_matches)` if we already had packages
done with the final label when we go to reuse the cache.

(Basically, if we use the cache multiple times it's hard to avoid
 relabeling all the time which is unfortunate...gets back a bit to
 a way to annotate pkgcache commits as supporting multiple policies)

Closes: #1109
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-11-17 15:06:50 -05:00 committed by Atomic Bot
parent d87970966b
commit 3c0da8864b
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/rpmostree-compose-builtin-tree.c
View File

@ -514,6 +514,11 @@ install_packages_in_root (RpmOstreeTreeComposeContext *self,
{
if (!rpmostree_context_import (self->corectx, cancellable, error))
return FALSE;
/* Depending on cache state, we may have some pkgs already
* labeled with a final target policy.
*/
if (!rpmostree_context_relabel (self->corectx, cancellable, error))
return FALSE;
rpmostree_context_set_tmprootfs_dfd (self->corectx, rootfs_dfd);
if (!rpmostree_context_assemble (self->corectx, cancellable, error))
return FALSE;

8
tests/compose-tests/test-basic-unified.sh
View File

@ -30,3 +30,11 @@ ostree --repo=${repobuild} cat ${treeref} /usr/lib/tmpfiles.d/pkg-chrony.conf >
# And this one has a non-root uid
assert_file_has_content_literal autovar.txt 'd /var/log/chrony 0755 chrony chrony - -'
echo "ok autovar"
# And redo it to trigger relabeling
origrev=$(ostree --repo=${repobuild} rev-parse ${treeref})
runcompose --force-nocache --ex-unified-core
newrev=$(ostree --repo=${repobuild} rev-parse ${treeref})
assert_not_streq "${origrev}" "${newrev}"
echo "ok rerun"