Fix bootstrapping from Git on CentOS7 when systemd is not running#915
Merged
rallytime merged 1 commit intosaltstack:developfrom Jul 18, 2016
vutny:fix-centos7-git-container-build
Merged
Fix bootstrapping from Git on CentOS7 when systemd is not running#915rallytime merged 1 commit intosaltstack:developfrom vutny:fix-centos7-git-container-build
systemd is not running#915rallytime merged 1 commit intosaltstack:developfrom
vutny:fix-centos7-git-container-build
Conversation
e.g. during the build process of container/VM images
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
If you'd like to build a CentOS 7 container/VM image containing Salt using
docker buildorPackeretc withbootstrap-salt.sh, it will fail to performgitinstallation type.The main problem is in
install_centos_git_post()function which executes/bin/systemctl daemon-reloadat the very end. As a result, ifsystemdis not running (because we're building an image and there is no init system running on target), later logic in the script detects the return code not equal to0and aborts execution.By this PR the post install functions will always return
0. Also, I've made some optimizations to execute/bin/systemctlonly when it is necessary.Previous Behavior
Git installation type fails when building OS images:
New Behavior
Git installation type succeeds.