summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@kekalainen.net>2020-04-09 21:23:25 +0300
committerOtto Kekäläinen <otto@kekalainen.net>2020-05-16 10:42:35 +0300
commitdab5698b3c019b5d33d58c96d55b03f6484df6f5 (patch)
treef7cd56f812beea6cb5002fd2c21305acf915eb1f
parent69964c4425778efdecf7bc4f0006eb76e77e91a7 (diff)
downloadmariadb-git-dab5698b3c019b5d33d58c96d55b03f6484df6f5.tar.gz
Deb: Stop using mariadb-service-convert
We can't expect that users want to always convert their mysqld_safe settings on an upgrade. In its current form it will always run, and that seems unnecessary on every single installation. Also the script is buggy, leaks mysqld_safe output into the written file and since it gets syntax errors the whole mariadb.service will fail to work.
-rw-r--r--debian/mariadb-server-10.5.postinst6
1 files changed, 0 insertions, 6 deletions
diff --git a/debian/mariadb-server-10.5.postinst b/debian/mariadb-server-10.5.postinst
index abf3355e18a..62220578ab6 100644
--- a/debian/mariadb-server-10.5.postinst
+++ b/debian/mariadb-server-10.5.postinst
@@ -198,12 +198,6 @@ EOF
fi
fi
- # copy out any mysqld_safe settings
- systemd_conf=/etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
- if [ -x /usr/bin/mariadb-service-convert -a ! -f "${systemd_conf}" ]; then
- mkdir -p /etc/systemd/system/mariadb.service.d
- /usr/bin/mariadb-service-convert > "${systemd_conf}"
- fi
;;
abort-upgrade|abort-remove|abort-configure)