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.

Sign up for GitHub

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

Jump to bottom

Fix issue 1930 and issue 1931 #1932

Closed
wants to merge 2 commits into from
Closed

Fix issue 1930 and issue 1931 #1932

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1040a77
added missing _ONEDIR_DIR to URLs
schories May 24, 2023
f3de636
now checking for "salt-" as well as "/salt/run/run"
schories May 24, 2023
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
6 changes: 3 additions & 3 deletions bootstrap-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4587,7 +4587,7 @@ __install_saltstack_rhel_repository() {

# Avoid using '$releasever' variable for yum.
# Instead, this should work correctly on all RHEL variants.
base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
base_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR$}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
gpg_key="SALTSTACK-GPG-KEY.pub base/RPM-GPG-KEY-CentOS-7"
elif [ "${DISTRO_MAJOR_VERSION}" -ge 9 ]; then
Expand Down Expand Up @@ -4615,7 +4615,7 @@ enabled=1
enabled_metadata=1
_eof

fetch_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
fetch_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR$}/{__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
for key in $gpg_key; do
__rpm_import_gpg "${fetch_url}${key}" || return 1
done
Expand Down Expand Up @@ -9310,7 +9310,7 @@ daemons_running() {
echoerror "salt-$fname was not found running"
FAILED_DAEMONS=$((FAILED_DAEMONS + 1))
fi
elif [ "$(ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then
elif [ "$(ps wwwaux | grep -v grep | egrep "salt/run/run $fname|salt-$fname")" = "" ]; then
echoerror "salt-$fname was not found running"
FAILED_DAEMONS=$((FAILED_DAEMONS + 1))
fi
Expand Down