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

Remove support for openSUSE Leap 42.2

Browse source 
Leap 42.2 is EOL and has been replaced by 42.3

This commit also simplifies some of the logic in checking for suse versions.

openSUSE 13.X is no longer supported and hasn't been for some time, so we
don't need to worry about checking for those versions any longer. The script
will bail out at the `__check_end_of_life_versions` functions early on in the
install process.
This commit is contained in:
rallytime 2018-07-11 11:11:58 -04:00
parent c345e3e419
commit 14959e04bd
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
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
~~~~~~~~~~~
- openSUSE Leap 42.2/42.3
- openSUSE Leap 42.3
- openSUSE Tumbleweed 2015
- 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
#
# <= 13.X
# <= 42.1
if [ "$DISTRO_MAJOR_VERSION" -le 13 ] || \
{ [ "$DISTRO_MAJOR_VERSION" -eq 42 ] && [ "$DISTRO_MINOR_VERSION" -le 1 ]; }; then
# <= 42.2
if [ "$DISTRO_MAJOR_VERSION" -lt 15 ] || \
{ [ "$DISTRO_MAJOR_VERSION" -eq 42 ] && [ "$DISTRO_MINOR_VERSION" -le 2 ]; }; then
echoerror "End of life distributions are not supported."
echoerror "Please consider upgrading to the next stable. See:"
echoerror " http://en.opensuse.org/Lifetime"
@ -5473,15 +5473,10 @@ __set_suse_pkg_repo() {
# Set distro repo variable
if [ "${DISTRO_MAJOR_VERSION}" -gt 2015 ]; then
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}"
elif [ "${DISTRO_MAJOR_VERSION}" -lt 42 ]; then
case ${DISTRO_MAJOR_VERSION} in
15) DISTRO_REPO="openSUSE_Leap_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}"
;;
*) DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}_SP${SUSE_PATCHLEVEL}"
;;
esac
else
DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}_SP${SUSE_PATCHLEVEL}"
fi
if [ "$_DOWNSTREAM_PKG_REPO" -eq $BS_TRUE ]; then
@ -5688,8 +5683,7 @@ install_opensuse_git_post() {
if [ -f /bin/systemctl ]; then
use_usr_lib=$BS_FALSE
if [ "${DISTRO_MAJOR_VERSION}" -gt 13 ] || \
{ [ "${DISTRO_MAJOR_VERSION}" -eq 13 ] && [ "${DISTRO_MINOR_VERSION}" -ge 2 ]; }; then
if [ "${DISTRO_MAJOR_VERSION}" -ge 15 ]; then
use_usr_lib=$BS_TRUE
fi