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

Merge pull request #1262 from rallytime/remove-42.2-leap

Browse source 
Remove support for openSUSE Leap 42.2
This commit is contained in:
Nicole Thomas 2018-07-12 09:17:15 -04:00 • committed by GitHub
commit 8f2e1801c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -266,7 +266,7 @@ Red Hat family
SUSE family SUSE family
~~~~~~~~~~~ ~~~~~~~~~~~
- openSUSE Leap 42.2/42.3 - openSUSE Leap 42.3
- openSUSE Tumbleweed 2015 - openSUSE Tumbleweed 2015
- SUSE Linux Enterprise Server 11 SP4, 12 SP2 - SUSE Linux Enterprise Server 11 SP4, 12 SP2

20
bootstrap-salt.sh
View file

@ -1526,9 +1526,9 @@ __check_end_of_life_versions() {
# openSUSE versions not supported # openSUSE versions not supported
# #
# <= 13.X # <= 13.X
# <= 42.1 # <= 42.2
if [ "$DISTRO_MAJOR_VERSION" -le 13 ] || \ if [ "$DISTRO_MAJOR_VERSION" -lt 15 ] || \
{ [ "$DISTRO_MAJOR_VERSION" -eq 42 ] && [ "$DISTRO_MINOR_VERSION" -le 1 ]; }; then { [ "$DISTRO_MAJOR_VERSION" -eq 42 ] && [ "$DISTRO_MINOR_VERSION" -le 2 ]; }; then
echoerror "End of life distributions are not supported." echoerror "End of life distributions are not supported."
echoerror "Please consider upgrading to the next stable. See:" echoerror "Please consider upgrading to the next stable. See:"
echoerror " http://en.opensuse.org/Lifetime" echoerror " http://en.opensuse.org/Lifetime"
@ -5473,15 +5473,10 @@ __set_suse_pkg_repo() {
# Set distro repo variable # Set distro repo variable
if [ "${DISTRO_MAJOR_VERSION}" -gt 2015 ]; then if [ "${DISTRO_MAJOR_VERSION}" -gt 2015 ]; then
DISTRO_REPO="openSUSE_Tumbleweed" DISTRO_REPO="openSUSE_Tumbleweed"
elif [ "${DISTRO_MAJOR_VERSION}" -ge 42 ]; then elif [ "${DISTRO_MAJOR_VERSION}" -ge 42 ] || [ "${DISTRO_MAJOR_VERSION}" -eq 15 ]; then
DISTRO_REPO="openSUSE_Leap_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}" DISTRO_REPO="openSUSE_Leap_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}"
elif [ "${DISTRO_MAJOR_VERSION}" -lt 42 ]; then else
case ${DISTRO_MAJOR_VERSION} in DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}_SP${SUSE_PATCHLEVEL}"
15) DISTRO_REPO="openSUSE_Leap_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}"
;;
*) DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}_SP${SUSE_PATCHLEVEL}"
;;
esac
fi fi
if [ "$_DOWNSTREAM_PKG_REPO" -eq $BS_TRUE ]; then if [ "$_DOWNSTREAM_PKG_REPO" -eq $BS_TRUE ]; then
@ -5688,8 +5683,7 @@ install_opensuse_git_post() {
if [ -f /bin/systemctl ]; then if [ -f /bin/systemctl ]; then
use_usr_lib=$BS_FALSE use_usr_lib=$BS_FALSE
if [ "${DISTRO_MAJOR_VERSION}" -gt 13 ] || \ if [ "${DISTRO_MAJOR_VERSION}" -ge 15 ]; then
{ [ "${DISTRO_MAJOR_VERSION}" -eq 13 ] && [ "${DISTRO_MINOR_VERSION}" -ge 2 ]; }; then
use_usr_lib=$BS_TRUE use_usr_lib=$BS_TRUE
fi fi