Browse code

Merge "Return mysql-server to default for all ubuntu installs"

Jenkins authored on 2014/12/04 00:47:35
Showing 1 changed files
... ...
@@ -141,12 +141,14 @@ EOF
141 141
         chmod 0600 $HOME/.my.cnf
142 142
     fi
143 143
     # Install mysql-server
144
-    if is_ubuntu || is_fedora; then
145
-        if [[ $DISTRO =~ (rhel6|precise) ]]; then
144
+    if is_fedora; then
145
+        if [[ $DISTRO =~ (rhel6) ]]; then
146 146
             install_package mysql-server
147 147
         else
148 148
             install_package mariadb-server
149 149
         fi
150
+    elif is_ubuntu; then
151
+        install_package mysql-server
150 152
     elif is_suse; then
151 153
         if ! is_package_installed mariadb; then
152 154
             install_package mysql-community-server