diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index d12e47b2..ee25d3f0 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -756,7 +756,7 @@ selinux_relabel_var_if_needed (OstreeSysroot *sysroot, { g_auto(OstreeSepolicyFsCreatecon) con = { 0, }; const char *selabeled_abspath = glnx_strjoina ("/", selabeled); - if (!_ostree_sepolicy_preparefscreatecon (&con, sysroot->sepolicy, + if (!_ostree_sepolicy_preparefscreatecon (&con, sepolicy, selabeled_abspath, 0644, error)) return FALSE; @@ -2128,9 +2128,6 @@ ostree_sysroot_deploy_tree (OstreeSysroot *self, return FALSE; } - g_clear_object (&self->sepolicy); - self->sepolicy = g_object_ref (sepolicy); - if (!selinux_relabel_var_if_needed (self, sepolicy, os_deploy_dfd, cancellable, error)) return FALSE; @@ -2144,7 +2141,7 @@ ostree_sysroot_deploy_tree (OstreeSysroot *self, { g_auto(OstreeSepolicyFsCreatecon) con = { 0, }; - if (!_ostree_sepolicy_preparefscreatecon (&con, self->sepolicy, + if (!_ostree_sepolicy_preparefscreatecon (&con, sepolicy, "/etc/ostree/remotes.d/dummy.conf", 0644, error)) return FALSE; diff --git a/src/libostree/ostree-sysroot-private.h b/src/libostree/ostree-sysroot-private.h index 3900092a..4bc7802b 100644 --- a/src/libostree/ostree-sysroot-private.h +++ b/src/libostree/ostree-sysroot-private.h @@ -49,8 +49,6 @@ struct OstreeSysroot { gboolean loaded; - OstreeSePolicy *sepolicy; - GPtrArray *deployments; int bootversion; int subbootversion; diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c index 00db9f0a..bdf7376b 100644 --- a/src/libostree/ostree-sysroot.c +++ b/src/libostree/ostree-sysroot.c @@ -72,7 +72,6 @@ ostree_sysroot_finalize (GObject *object) OstreeSysroot *self = OSTREE_SYSROOT (object); g_clear_object (&self->path); - g_clear_object (&self->sepolicy); g_clear_object (&self->repo); g_clear_pointer (&self->deployments, g_ptr_array_unref); g_clear_object (&self->booted_deployment);