Skip to content

Commit

Permalink
deploy: Don't rebuild selinux policy on first deployment
Browse files Browse the repository at this point in the history
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: ostreedev#2758
  • Loading branch information
cgwalters committed Nov 9, 2022
1 parent e153720 commit bd32506
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/libostree/ostree-sysroot-deploy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit bd32506

Please sign in to comment.