Skip to content

Commit 6de7dba

Browse files
committed
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
1 parent a74ae5d commit 6de7dba

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

lib/databases/mysql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,14 @@ EOF
141141
chmod 0600 $HOME/.my.cnf
142142
fi
143143
# 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
146146
install_package mysql-server
147147
else
148148
install_package mariadb-server
149149
fi
150+
elif is_ubuntu; then
151+
install_package mysql-server
150152
elif is_suse; then
151153
if ! is_package_installed mariadb; then
152154
install_package mysql-community-server

0 commit comments

Comments
 (0)