Browse code
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
pcrews authored on 2014/11/19 13:50:00Showing 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 |