From 040ed0e99f2b70eb1ef5463da8e44c1162787207 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Fri, 7 Mar 2025 22:58:08 -0500 Subject: [PATCH] * Fri Mar 07 2025 Jean-Philippe Pialasse 11.0.0-9.sme - upgrade to support mariadb 11.4 [SME: 12930] move mariadb-upgrade to mysql.init unit, remove duplicate in 00_restore_dumped_dbs and 10mysql_upgrade add our tmp.d add post action dnf script update mariadb.service.d/ content set default to utfmb4 - TODO mysql.dump filtering [SME: 12592] - TODO feedback plugin [SME: 12897] * Sun Jan 26 2025 Jean-Philippe Pialasse 11.0.0-8.sme - prestart script requires daemontools bins [SME: 12566] --- .../templates/etc/e-smith/sql/init/00_restore_dumped_dbs | 4 ++-- root/etc/e-smith/templates/etc/my.cnf/006pid-file | 2 +- root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf | 4 ++-- root/usr/lib/tmpfiles.d/smemariadb.conf | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs b/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs index 6e08a17..6ed5853 100644 --- a/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs +++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs @@ -2,11 +2,11 @@ ( cat /home/e-smith/db/mysql/mysql.dump ; cat /var/lib/mysql.private/set.password ) | mysql || exit 1 -/bin/rm /var/run/mariadb/mariadb.pid +/bin/rm /run/mariadb/mariadb.pid /usr/bin/systemctl restart mariadb.service for i in $(seq 1 20); do - if [ -f /var/run/mariadb/mariadb.pid ] + if [ -f /run/mariadb/mariadb.pid ] then /bin/rm /home/e-smith/db/mysql/mysql.dump exit 0 diff --git a/root/etc/e-smith/templates/etc/my.cnf/006pid-file b/root/etc/e-smith/templates/etc/my.cnf/006pid-file index 83bbe9e..b0a87c4 100644 --- a/root/etc/e-smith/templates/etc/my.cnf/006pid-file +++ b/root/etc/e-smith/templates/etc/my.cnf/006pid-file @@ -1 +1 @@ -pid-file=/var/run/mariadb/mariadb.pid +pid-file=/run/mariadb/mariadb.pid diff --git a/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf b/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf index f8de643..2af674a 100644 --- a/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf +++ b/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf @@ -9,7 +9,7 @@ PermissionsStartOnly=true #reset ExecStartPre= -ExecStartPre=/usr/bin/install -d /var/run/mariadb -o mysql -g mysql -m 0755 +ExecStartPre=/usr/bin/install -d /run/mariadb -o mysql -g mysql -m 0755 # add mariadb >=10.6 specifics ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION" @@ -34,7 +34,7 @@ ExecStart=/usr/sbin/mariadbd \ --basedir=/usr \ --datadir=/var/lib/mysql \ --user=mysql \ - --pid-file=/var/run/mariadb/mariadb.pid + --pid-file=/run/mariadb/mariadb.pid ExecStartPost=-/sbin/e-smith/systemd/mariadb-post diff --git a/root/usr/lib/tmpfiles.d/smemariadb.conf b/root/usr/lib/tmpfiles.d/smemariadb.conf index ba59d5b..547fcef 100644 --- a/root/usr/lib/tmpfiles.d/smemariadb.conf +++ b/root/usr/lib/tmpfiles.d/smemariadb.conf @@ -1 +1 @@ -d /var/run/mariadb 0755 mysql mysql - +d /run/mariadb 0755 mysql mysql -