Skip to content

Commit e5c03a5

Browse files
dmurphy18dmurphy18
committed
Restrict use of dnf to Fedora only, otherwise use yum when dealing with RedHat family
1 parent 54243fe commit e5c03a5

1 file changed

Lines changed: 26 additions & 26 deletions

File tree

‎bootstrap-salt.sh‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4224,8 +4224,8 @@ __install_saltstack_rhel_onedir_repository() {
42244224
REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1)
42254225
if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
42264226
# Enable the Salt 3007 STS repo
4227-
dnf config-manager --set-disable salt-repo-*
4228-
dnf config-manager --set-enabled salt-repo-3007-sts
4227+
yum config-manager --set-disable salt-repo-*
4228+
yum config-manager --set-enabled salt-repo-3007-sts
42294229
fi
42304230
elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
42314231
# using minor version
@@ -4243,11 +4243,11 @@ __install_saltstack_rhel_onedir_repository() {
42434243
fi
42444244
else
42454245
# Enable the Salt LATEST repo
4246-
dnf config-manager --set-disable salt-repo-*
4247-
dnf config-manager --set-enabled salt-repo-latest
4246+
yum config-manager --set-disable salt-repo-*
4247+
yum config-manager --set-enabled salt-repo-latest
42484248
fi
4249-
dnf clean expire-cache || return 1
4250-
dnf makecache || return 1
4249+
yum clean expire-cache || return 1
4250+
yum makecache || return 1
42514251
elif [ "$ONEDIR_REV" != "latest" ]; then
42524252
echowarn "salt.repo already exists, ignoring salt version argument."
42534253
echowarn "Use -F (forced overwrite) to install $ONEDIR_REV."
@@ -4559,8 +4559,8 @@ install_centos_onedir() {
45594559
fi
45604560

45614561
# shellcheck disable=SC2086
4562-
dnf makecache || return 1
4563-
dnf list salt-minion || return 1
4562+
yum makecache || return 1
4563+
yum list salt-minion || return 1
45644564
__yum_install_noinput ${__PACKAGES} || return 1
45654565

45664566
return 0
@@ -5661,8 +5661,8 @@ install_amazon_linux_ami_2_deps() {
56615661
REPO_REV_MAJOR=$(echo "$STABLE_REV" | cut -d '.' -f 1)
56625662
if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
56635663
# Enable the Salt 3007 STS repo
5664-
dnf config-manager --set-disable salt-repo-*
5665-
dnf config-manager --set-enabled salt-repo-3007-sts
5664+
yum config-manager --set-disable salt-repo-*
5665+
yum config-manager --set-enabled salt-repo-3007-sts
56665666
fi
56675667
elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
56685668
# using minor version
@@ -5680,11 +5680,11 @@ install_amazon_linux_ami_2_deps() {
56805680
fi
56815681
else
56825682
# Enable the Salt LATEST repo
5683-
dnf config-manager --set-disable salt-repo-*
5684-
dnf config-manager --set-enabled salt-repo-latest
5683+
yum config-manager --set-disable salt-repo-*
5684+
yum config-manager --set-enabled salt-repo-latest
56855685
fi
5686-
dnf clean expire-cache || return 1
5687-
dnf makecache || return 1
5686+
yum clean expire-cache || return 1
5687+
yum makecache || return 1
56885688
fi
56895689
fi
56905690

@@ -5726,8 +5726,8 @@ install_amazon_linux_ami_2_onedir_deps() {
57265726
REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1)
57275727
if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
57285728
# Enable the Salt 3007 STS repo
5729-
dnf config-manager --set-disable salt-repo-*
5730-
dnf config-manager --set-enabled salt-repo-3007-sts
5729+
yum config-manager --set-disable salt-repo-*
5730+
yum config-manager --set-enabled salt-repo-3007-sts
57315731
fi
57325732
elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
57335733
# using minor version
@@ -5745,11 +5745,11 @@ install_amazon_linux_ami_2_onedir_deps() {
57455745
fi
57465746
else
57475747
# Enable the Salt LATEST repo
5748-
dnf config-manager --set-disable salt-repo-*
5749-
dnf config-manager --set-enabled salt-repo-latest
5748+
yum config-manager --set-disable salt-repo-*
5749+
yum config-manager --set-enabled salt-repo-latest
57505750
fi
5751-
dnf clean expire-cache || return 1
5752-
dnf makecache || return 1
5751+
yum clean expire-cache || return 1
5752+
yum makecache || return 1
57535753
fi
57545754
fi
57555755

@@ -5879,8 +5879,8 @@ install_amazon_linux_ami_2023_onedir_deps() {
58795879
REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1)
58805880
if [ "$REPO_REV_MAJOR" -eq "3007" ]; then
58815881
# Enable the Salt 3007 STS repo
5882-
dnf config-manager --set-disable salt-repo-*
5883-
dnf config-manager --set-enabled salt-repo-3007-sts
5882+
yum config-manager --set-disable salt-repo-*
5883+
yum config-manager --set-enabled salt-repo-3007-sts
58845884
fi
58855885
elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then
58865886
# using minor version
@@ -5898,11 +5898,11 @@ install_amazon_linux_ami_2023_onedir_deps() {
58985898
fi
58995899
else
59005900
# Enable the Salt LATEST repo
5901-
dnf config-manager --set-disable salt-repo-*
5902-
dnf config-manager --set-enabled salt-repo-latest
5901+
yum config-manager --set-disable salt-repo-*
5902+
yum config-manager --set-enabled salt-repo-latest
59035903
fi
5904-
dnf clean expire-cache || return 1
5905-
dnf makecache || return 1
5904+
yum clean expire-cache || return 1
5905+
yum makecache || return 1
59065906
fi
59075907
fi
59085908

0 commit comments

Comments
 (0)