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

Merge pull request #2760 from cgwalters/offline-deploy-no-bwrap 

deploy: Don't rebuild selinux policy on first deployment
This commit is contained in:
Luca Bruno 2022-11-11 10:16:17 +00:00 committed by GitHub
parent e66e0b06ef bd325061dc
commit 8cb50c16a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2987,12 +2987,12 @@ sysroot_finalize_deployment (OstreeSysroot *self,
if (!merge_configuration_from (self, merge_deployment, deployment, deployment_dfd, if (!merge_configuration_from (self, merge_deployment, deployment, deployment_dfd,
cancellable, error)) cancellable, error))
return FALSE; return FALSE;
}
#ifdef HAVE_SELINUX #ifdef HAVE_SELINUX
if (!sysroot_finalize_selinux_policy(deployment_dfd, error)) if (!sysroot_finalize_selinux_policy (deployment_dfd, error))
return FALSE; return FALSE;
#endif /* HAVE_SELINUX */ #endif /* HAVE_SELINUX */
}
const char *osdeploypath = glnx_strjoina ("ostree/deploy/", ostree_deployment_get_osname (deployment)); const char *osdeploypath = glnx_strjoina ("ostree/deploy/", ostree_deployment_get_osname (deployment));
glnx_autofd int os_deploy_dfd = -1; glnx_autofd int os_deploy_dfd = -1;