Browse code

Merge "Remove Fedora 19 as supported distribution"

Jenkins authored on 2015/01/12 14:24:20
Showing 2 changed files
... ...
@@ -143,7 +143,7 @@ source $TOP_DIR/stackrc
143 143
 
144 144
 # Warn users who aren't on an explicitly supported distro, but allow them to
145 145
 # override check and attempt installation with ``FORCE=yes ./stack``
146
-if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|f21|rhel6|rhel7) ]]; then
146
+if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f20|f21|rhel6|rhel7) ]]; then
147 147
     echo "WARNING: this script has not been tested on $DISTRO"
148 148
     if [[ "$FORCE" != "yes" ]]; then
149 149
         die $LINENO "If you wish to run this script anyway run with FORCE=yes"
... ...
@@ -111,8 +111,8 @@ if is_fedora; then
111 111
     fi
112 112
 
113 113
     FORCE_FIREWALLD=$(trueorfalse False $FORCE_FIREWALLD)
114
-    if [[ ${DISTRO} =~ (f19|f20) && $FORCE_FIREWALLD == "False" ]]; then
115
-        # On Fedora 19 and 20 firewalld interacts badly with libvirt and
114
+    if [[ ${DISTRO} =~ (f20) && $FORCE_FIREWALLD == "False" ]]; then
115
+        # On Fedora 20 firewalld interacts badly with libvirt and
116 116
         # slows things down significantly.  However, for those cases
117 117
         # where that combination is desired, allow this fix to be skipped.
118 118