mirror of
https://github.com/ostreedev/ostree.git
synced 2025-01-06 17:18:25 +03:00
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
This commit is contained in:
parent
e153720f89
commit
bd325061dc
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user