From b903662ad044ece9201a5bbd8efca84ca0aeb106 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 17 Jun 2022 13:17:21 +0100 Subject: [PATCH] feat(bootstrap-salt): handle openSUSE downstream repo change for `15.4` The difference between `15.3` and `15.4` can be seen here: * https://download.opensuse.org/repositories/systemsmanagement:/saltstack/ - `openSUSE_Leap_15.3` - `15.4` (i.e. not `openSUSE_Leap_15.4`) --- bootstrap-salt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b0d6d68..e2a9b6c 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -6463,6 +6463,8 @@ __set_suse_pkg_repo() { # Set distro repo variable if [ "${DISTRO_MAJOR_VERSION}" -gt 2015 ]; then DISTRO_REPO="openSUSE_Tumbleweed" + elif [ "${DISTRO_MAJOR_VERSION}" -eq 15 ] && [ "${DISTRO_MINOR_VERSION}" -ge 4 ]; then + DISTRO_REPO="${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}" elif [ "${DISTRO_MAJOR_VERSION}" -ge 42 ] || [ "${DISTRO_MAJOR_VERSION}" -eq 15 ]; then DISTRO_REPO="openSUSE_Leap_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}" else