Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.21.x] fixes for selection of master version of masterfiles in Build #5578

Merged
merged 2 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/masterfiles-stage/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ git_cfbs_deploy_refspec() {
_start_wrkdir=$(pwd)
# Switch to the staging directory and build with cfbs
cd "${temp_stage}"
cfbs build || error_exit "cfbs build failed"
CFBS_GLOBAL_DIR="/opt/cfengine/build/cfbs_global" cfbs build || error_exit "cfbs build failed"
# Switch back to the original working dir
cd "${_start_wrkdir}"
# Grab HEAD so it can be used to populate cf_promises_release_id
Expand Down
4 changes: 4 additions & 0 deletions misc/selinux/cfengine-enterprise.te.all
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,10 @@ allow cfengine_cfbs_t cfengine_reactor_t:fifo_file { getattr ioctl read write };

allow cfengine_cfbs_t bin_t:file { map execute };

# cfbs runs some commands in a shell
allow cfengine_cfbs_t shell_exec_t:file map;
allow cfengine_cfbs_t shell_exec_t:file { execute execute_no_trans };

allow cfengine_cfbs_t cert_t:dir search;
allow cfengine_cfbs_t cert_t:file { getattr open read };
allow cfengine_cfbs_t cert_t:lnk_file read;
Expand Down
Loading