diff options
| author | Colin Walters <walters@verbum.org> | 2022-11-09 11:18:36 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2022-11-09 11:18:36 -0500 |
| commit | bd325061dc9585886f7e60e58d9fc0c8b37e71db (patch) | |
| tree | 3017241fc54caadd9a5ae4f814772f7fd921995d /src/libostree | |
| parent | e153720f89989f503ae97f7384b4c8976436bb24 (diff) | |
| download | ostree-bd325061dc9585886f7e60e58d9fc0c8b37e71db.tar.gz | |
deploy: Don't rebuild selinux policy on first deployment
Basically, it should not be necessary - the policy should be
up-to-date. We don't want to force on continual policy rebuilds.
Even trying to run bwrap when we're *not* in a booted
root can cause failures in nested containerization scenarios.
Closes: https://github.com/ostreedev/ostree/issues/2758
Diffstat (limited to 'src/libostree')
| -rw-r--r-- | src/libostree/ostree-sysroot-deploy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index f27ae0e1..26b07080 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -2987,12 +2987,12 @@ sysroot_finalize_deployment (OstreeSysroot *self, if (!merge_configuration_from (self, merge_deployment, deployment, deployment_dfd, cancellable, error)) return FALSE; - } #ifdef HAVE_SELINUX - if (!sysroot_finalize_selinux_policy(deployment_dfd, error)) - return FALSE; + if (!sysroot_finalize_selinux_policy (deployment_dfd, error)) + return FALSE; #endif /* HAVE_SELINUX */ + } const char *osdeploypath = glnx_strjoina ("ostree/deploy/", ostree_deployment_get_osname (deployment)); glnx_autofd int os_deploy_dfd = -1; |