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
This commit is contained in:
Kashyap Chamarthy 2015-01-02 18:39:29 +01:00
parent 27f0339f86
commit 7c9df1017c
2 changed files with 3 additions and 3 deletions

View File

@ -143,7 +143,7 @@ source $TOP_DIR/stackrc
# Warn users who aren't on an explicitly supported distro, but allow them to # Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack`` # 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" echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes" die $LINENO "If you wish to run this script anyway run with FORCE=yes"

View File

@ -111,8 +111,8 @@ if is_fedora; then
fi fi
FORCE_FIREWALLD=$(trueorfalse False $FORCE_FIREWALLD) FORCE_FIREWALLD=$(trueorfalse False $FORCE_FIREWALLD)
if [[ ${DISTRO} =~ (f19|f20) && $FORCE_FIREWALLD == "False" ]]; then if [[ ${DISTRO} =~ (f20) && $FORCE_FIREWALLD == "False" ]]; then
# On Fedora 19 and 20 firewalld interacts badly with libvirt and # On Fedora 20 firewalld interacts badly with libvirt and
# slows things down significantly. However, for those cases # slows things down significantly. However, for those cases
# where that combination is desired, allow this fix to be skipped. # where that combination is desired, allow this fix to be skipped.