From fd7b9ebe099814bc1ef1c25f7648523a531cbbcc Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Tue, 29 Aug 2017 12:58:25 +0300 Subject: [PATCH] Declare EOL for openSUSE LEAP 42.1 --- README.rst | 2 +- bootstrap-salt.sh | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 2e75fe7..58cb6d0 100644 --- a/README.rst +++ b/README.rst @@ -262,7 +262,7 @@ Red Hat family SUSE family ~~~~~~~~~~~ -- openSUSE Leap 42 +- openSUSE Leap 42.2/42.3 - openSUSE Tumbleweed 2015 - SUSE Linux Enterprise Server 11 SP1/11 SP2/11 SP3/12 diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index dca78ce..be451b4 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1490,8 +1490,8 @@ __check_end_of_life_versions() { # = 14.10 # = 15.04, 15.10 if [ "$DISTRO_MAJOR_VERSION" -lt 14 ] || \ - [ "$DISTRO_MAJOR_VERSION" -eq 15 ] || \ - ([ "$DISTRO_MAJOR_VERSION" -lt 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]); then + [ "$DISTRO_MAJOR_VERSION" -eq 15 ] || \ + ([ "$DISTRO_MAJOR_VERSION" -lt 16 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]); then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " https://wiki.ubuntu.com/Releases" @@ -1503,7 +1503,9 @@ __check_end_of_life_versions() { # openSUSE versions not supported # # <= 13.X - if [ "$DISTRO_MAJOR_VERSION" -le 13 ]; then + # <= 42.1 + if [ "$DISTRO_MAJOR_VERSION" -le 13 ] || \ + ([ "$DISTRO_MAJOR_VERSION" -eq 42 ] && [ "$DISTRO_MINOR_VERSION" -le 1 ]); then echoerror "End of life distributions are not supported." echoerror "Please consider upgrading to the next stable. See:" echoerror " http://en.opensuse.org/Lifetime"