From c9c51a53a80cd3d102750e5d41a306107cdc748a58fafe824e5aba0362375361 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 7 Oct 2021 15:06:06 +0000 Subject: [PATCH] Accepting request 923809 from home:dspinella:branches:server:database - Fix socket address in mariadb@.socket file OBS-URL: https://build.opensuse.org/request/show/923809 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=279 --- mariadb.changes | 5 +++++ mariadb.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/mariadb.changes b/mariadb.changes index 03822d0..2ccea42 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 7 15:02:44 UTC 2021 - Danilo Spinella + +- Fix socket address in mariadb@.socket file + ------------------------------------------------------------------- Mon Sep 20 09:01:17 UTC 2021 - Danilo Spinella diff --git a/mariadb.spec b/mariadb.spec index a9c841e..a3e6a1d 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -665,6 +665,10 @@ install -D -m 644 %{_sourcedir}/mariadb.target '%{buildroot}'%{_unitdir}/mariadb ln -sf %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysql.service ln -sf %{_unitdir}/mariadb@.service %{buildroot}%{_unitdir}/mysql@.service +# Replace the default socket for multi instance mariadb with the one used by +# mysql-systemd-helper +sed -e 's:mysql.sock-%I:mysql.%I.sock:' %{buildroot}%{_unitdir}/mariadb@.socket + # Tmpfiles file to exclude mysql tempfiles that are auto-cleaned up # bnc#852451 mkdir -p %{buildroot}%{_tmpfilesdir}