projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7445697
)
sysroot: Expose deployment runner outside of selinux
author
Colin Walters
<walters@verbum.org>
Fri, 1 Dec 2023 20:05:40 +0000
(15:05 -0500)
committer
Colin Walters
<walters@verbum.org>
Fri, 1 Dec 2023 20:06:10 +0000
(15:06 -0500)
We will use it in e.g. s390x zipl backend.
src/libostree/ostree-sysroot-deploy.c
patch
|
blob
|
history
diff --git
a/src/libostree/ostree-sysroot-deploy.c
b/src/libostree/ostree-sysroot-deploy.c
index 7648f29943f09b3807b4523f8103800684b60e85..8f93d4ab722783b5eb32e80128b163fe16717a11 100644
(file)
--- a/
src/libostree/ostree-sysroot-deploy.c
+++ b/
src/libostree/ostree-sysroot-deploy.c
@@
-3151,7
+3151,6
@@
get_var_dfd (OstreeSysroot *self, int osdeploy_dfd, OstreeDeployment *deployment
return glnx_opendirat (base_dfd, base_path, TRUE, ret_fd, error);
}
-#ifdef HAVE_SELINUX
static void
child_setup_fchdir (gpointer data)
{
@@
-3245,6
+3244,7
@@
_ostree_sysroot_run_in_deployment (int deployment_dfd, const char *const *bwrap_
(gpointer)(uintptr_t)deployment_dfd, stdout, NULL, exit_status, error);
}
+#ifdef HAVE_SELINUX
/*
* Run semodule to check if the module content changed after merging /etc
* and rebuild the policy if needed.