From 6de7dba863cfbe0fda6f918eea31adbd7d652676 Mon Sep 17 00:00:00 2001 From: pcrews Date: Tue, 18 Nov 2014 20:50:00 -0800 Subject: [PATCH] Return mysql-server to default for all ubuntu installs Change: I97cbede806e5c00363c7174fa1e9f286de96aab6 altered the logic in lib/databases/mysql from installing mariadb only if one was using rhel7 to installing it by default unless one was using rhel6. Change: Iae9a7a1c09f1fc83573c3926b3470955c244c401 Attempted to fix this, but only does so for precise. Unless mariadb has become the default, I strongly prefer to keep standard mysql as the database on ubuntu (precise or otherwise). Closes-Bug: 1395776 Change-Id: I3afb89ae6d55405313b7219dd6daa24d9ca80f70 --- lib/databases/mysql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/databases/mysql b/lib/databases/mysql index bbf2fd0861..eab1aa400f 100644 --- a/lib/databases/mysql +++ b/lib/databases/mysql @@ -141,12 +141,14 @@ EOF chmod 0600 $HOME/.my.cnf fi # Install mysql-server - if is_ubuntu || is_fedora; then - if [[ $DISTRO =~ (rhel6|precise) ]]; then + if is_fedora; then + if [[ $DISTRO =~ (rhel6) ]]; then install_package mysql-server else install_package mariadb-server fi + elif is_ubuntu; then + install_package mysql-server elif is_suse; then if ! is_package_installed mariadb; then install_package mysql-community-server