diff --git a/stack.sh b/stack.sh index 3fa32125ac..696dc2473b 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.