From 87d02ed00f3d26439d7cfe3c93c5cf175161efe1 Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Tue, 19 Sep 2017 11:14:56 +0300 Subject: [PATCH 1/3] Declare EOL for SUSE Linux Enterprise Server < 11 SP4 --- README.rst | 2 +- bootstrap-salt.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 3951187..21d3549 100644 --- a/README.rst +++ b/README.rst @@ -264,7 +264,7 @@ SUSE family - openSUSE Leap 42.2/42.3 - openSUSE Tumbleweed 2015 -- SUSE Linux Enterprise Server 11 SP1/11 SP2/11 SP3/12 +- SUSE Linux Enterprise Server 11 SP4/12 Ubuntu and derivatives diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index bb3fd09..3d8c205 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1520,13 +1520,13 @@ __check_end_of_life_versions() { suse) # SuSE versions not supported # - # < 11 SP2 + # < 11 SP4 SUSE_PATCHLEVEL=$(awk '/PATCHLEVEL/ {print $3}' /etc/SuSE-release ) if [ "${SUSE_PATCHLEVEL}" = "" ]; then SUSE_PATCHLEVEL="00" fi - if ([ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$SUSE_PATCHLEVEL" -lt 02 ]) || [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then - echoerror "Versions lower than SuSE 11 SP2 are not supported." + if ([ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$SUSE_PATCHLEVEL" -lt 04 ]) || [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then + echoerror "Versions lower than SuSE 11 SP4 are not supported." echoerror "Please consider upgrading to the next stable" exit 1 fi From 5ba3e346fb1ddc0760caebfecbe74fb25ab998f6 Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Thu, 21 Sep 2017 16:53:34 +0300 Subject: [PATCH 2/3] Declare EOL for SUSE Linux Enterprise Server 12 < SP2 --- README.rst | 2 +- bootstrap-salt.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 21d3549..babddbc 100644 --- a/README.rst +++ b/README.rst @@ -264,7 +264,7 @@ SUSE family - openSUSE Leap 42.2/42.3 - openSUSE Tumbleweed 2015 -- SUSE Linux Enterprise Server 11 SP4/12 +- SUSE Linux Enterprise Server 11 SP4/12 SP2 Ubuntu and derivatives diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 3d8c205..306425a 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1521,12 +1521,15 @@ __check_end_of_life_versions() { # SuSE versions not supported # # < 11 SP4 + # < 12 SP2 SUSE_PATCHLEVEL=$(awk '/PATCHLEVEL/ {print $3}' /etc/SuSE-release ) if [ "${SUSE_PATCHLEVEL}" = "" ]; then SUSE_PATCHLEVEL="00" fi - if ([ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$SUSE_PATCHLEVEL" -lt 04 ]) || [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then - echoerror "Versions lower than SuSE 11 SP4 are not supported." + if [ "$DISTRO_MAJOR_VERSION" -lt 11 ] || \ + ([ "$DISTRO_MAJOR_VERSION" -eq 11 ] && [ "$SUSE_PATCHLEVEL" -lt 04 ]) || \ + ([ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$SUSE_PATCHLEVEL" -lt 02 ]); then + echoerror "Versions lower than SuSE 11 SP4 or 12 SP2 are not supported." echoerror "Please consider upgrading to the next stable" exit 1 fi From 5370e2cc39a4fcc29908fd41d9c17a4015e47f78 Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Fri, 22 Sep 2017 11:16:43 +0300 Subject: [PATCH 3/3] Add link to SUSE releases page --- README.rst | 2 +- bootstrap-salt.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index babddbc..8ea0854 100644 --- a/README.rst +++ b/README.rst @@ -264,7 +264,7 @@ SUSE family - openSUSE Leap 42.2/42.3 - openSUSE Tumbleweed 2015 -- SUSE Linux Enterprise Server 11 SP4/12 SP2 +- SUSE Linux Enterprise Server 11 SP4, 12 SP2 Ubuntu and derivatives diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 306425a..a3db5f1 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1531,6 +1531,7 @@ __check_end_of_life_versions() { ([ "$DISTRO_MAJOR_VERSION" -eq 12 ] && [ "$SUSE_PATCHLEVEL" -lt 02 ]); then echoerror "Versions lower than SuSE 11 SP4 or 12 SP2 are not supported." echoerror "Please consider upgrading to the next stable" + echoerror " https://www.suse.com/lifecycle/" exit 1 fi ;;