saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1054 from vutny/fix-centos-git-deps

Browse source 
Fix `git` bootstrap mode for CentOS
This commit is contained in:
Nicole Thomas 2017-04-24 09:14:04 -06:00 • committed by GitHub
commit 5ddefbdbfd
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrap-salt.sh
View file

@ -3732,9 +3732,7 @@ install_centos_stable_post() {
}
install_centos_git_deps() {
if [ $_DISABLE_REPOS -eq $BS_FALSE ]; then
__install_epel_repository || return 1
fi
install_centos_stable_deps || return 1
if [ "$_INSECURE_DL" -eq $BS_FALSE ] && [ "${_SALT_REPO_URL%%://*}" = "https" ]; then
if [ "$DISTRO_MAJOR_VERSION" -gt 5 ]; then
@ -3744,8 +3742,6 @@ install_centos_git_deps() {
fi
fi
install_centos_stable_deps || return 1
if ! __check_command_exists git; then
__yum_install_noinput git || return 1
fi