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

sysroot: Don't cache sepolicy 

In [this commit](6ce80f9685)
for some reason I added a `sepolicy` member to the sysroot.  I
have no idea why I did that, and it's conceptually wrong
since the policy is specific to a *deployment*.

This bit me when I was working on [a pull request](https://github.com/ostreedev/ostree/pull/763)
elsewhere, since at that point it was `NULL`.

We already pass around the sepolicy in the deployment code, so just stop caching
it.

Closes: #764
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-03-28 11:16:09 -04:00 committed by Atomic Bot
parent 562cb55f51
commit 5333a429ce
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libostree/ostree-sysroot-deploy.c
View File

@ -756,7 +756,7 @@ selinux_relabel_var_if_needed (OstreeSysroot *sysroot,
{ g_auto(OstreeSepolicyFsCreatecon) con = { 0, }; { g_auto(OstreeSepolicyFsCreatecon) con = { 0, };
const char *selabeled_abspath = glnx_strjoina ("/", selabeled); const char *selabeled_abspath = glnx_strjoina ("/", selabeled);
if (!_ostree_sepolicy_preparefscreatecon (&con, sysroot->sepolicy, if (!_ostree_sepolicy_preparefscreatecon (&con, sepolicy,
selabeled_abspath, selabeled_abspath,
0644, error)) 0644, error))
return FALSE; return FALSE;
@ -2128,9 +2128,6 @@ ostree_sysroot_deploy_tree (OstreeSysroot *self,
return FALSE; return FALSE;
} }
g_clear_object (&self->sepolicy);
self->sepolicy = g_object_ref (sepolicy);
if (!selinux_relabel_var_if_needed (self, sepolicy, os_deploy_dfd, if (!selinux_relabel_var_if_needed (self, sepolicy, os_deploy_dfd,
cancellable, error)) cancellable, error))
return FALSE; return FALSE;
@ -2144,7 +2141,7 @@ ostree_sysroot_deploy_tree (OstreeSysroot *self,
{ g_auto(OstreeSepolicyFsCreatecon) con = { 0, }; { g_auto(OstreeSepolicyFsCreatecon) con = { 0, };
if (!_ostree_sepolicy_preparefscreatecon (&con, self->sepolicy, if (!_ostree_sepolicy_preparefscreatecon (&con, sepolicy,
"/etc/ostree/remotes.d/dummy.conf", "/etc/ostree/remotes.d/dummy.conf",
0644, error)) 0644, error))
return FALSE; return FALSE;

2
src/libostree/ostree-sysroot-private.h
View File

@ -49,8 +49,6 @@ struct OstreeSysroot {
gboolean loaded; gboolean loaded;
OstreeSePolicy *sepolicy;
GPtrArray *deployments; GPtrArray *deployments;
int bootversion; int bootversion;
int subbootversion; int subbootversion;

1
src/libostree/ostree-sysroot.c
View File

@ -72,7 +72,6 @@ ostree_sysroot_finalize (GObject *object)
OstreeSysroot *self = OSTREE_SYSROOT (object); OstreeSysroot *self = OSTREE_SYSROOT (object);
g_clear_object (&self->path); g_clear_object (&self->path);
g_clear_object (&self->sepolicy);
g_clear_object (&self->repo); g_clear_object (&self->repo);
g_clear_pointer (&self->deployments, g_ptr_array_unref); g_clear_pointer (&self->deployments, g_ptr_array_unref);
g_clear_object (&self->booted_deployment); g_clear_object (&self->booted_deployment);