From 7c9df1017cb249afd329e915aab8a04b04940bc2 Mon Sep 17 00:00:00 2001 From: Kashyap Chamarthy Date: Fri, 2 Jan 2015 18:39:29 +0100 Subject: [PATCH] Remove Fedora 19 as supported distribution Fedora 19 will reach its end of life on 6-JAN-2015 https://lists.fedoraproject.org/pipermail/announce/2014-December/003243.html Remove it as a supported distribution and add Fedora 21 - stack.sh: Remove Fedora 19 from list of 'supported' distributions. - tools/fixup_stuff.sh: Remove Fedora 19. Also remove the workaround of disabling firewalld for Fedora 21. Change-Id: If92b87d2f9a2bb95469730cda201a7981670f727 --- stack.sh | 2 +- tools/fixup_stuff.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stack.sh b/stack.sh index 605d3cc889..61d9cd74cd 100755 --- a/stack.sh +++ b/stack.sh @@ -143,7 +143,7 @@ source $TOP_DIR/stackrc # Warn users who aren't on an explicitly supported distro, but allow them to # override check and attempt installation with ``FORCE=yes ./stack`` -if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|f21|rhel6|rhel7) ]]; then +if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f20|f21|rhel6|rhel7) ]]; then echo "WARNING: this script has not been tested on $DISTRO" if [[ "$FORCE" != "yes" ]]; then die $LINENO "If you wish to run this script anyway run with FORCE=yes" diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index 26aae82535..c7f1efa441 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -111,8 +111,8 @@ if is_fedora; then fi FORCE_FIREWALLD=$(trueorfalse False $FORCE_FIREWALLD) - if [[ ${DISTRO} =~ (f19|f20) && $FORCE_FIREWALLD == "False" ]]; then - # On Fedora 19 and 20 firewalld interacts badly with libvirt and + if [[ ${DISTRO} =~ (f20) && $FORCE_FIREWALLD == "False" ]]; then + # On Fedora 20 firewalld interacts badly with libvirt and # slows things down significantly. However, for those cases # where that combination is desired, allow this fix to be skipped.