update check if mariadb running and exit

- fix conflict with MariaDB-server-compat [SME: 13024]

createlinks

@@ -3,20 +3,21 @@
 use esmith::Build::CreateLinks  qw(:all);
 
 # we add few link fromn old mysql things to mariadb things
-safe_symlink("/usr/bin/mariadb-dump","root/usr/bin/mysqldump");
+# some are provided by MariaDB-client-compat
-safe_symlink("/usr/bin/mariadb-dumpslow","root/usr/bin/mysqldumpslow");
+#safe_symlink("/usr/bin/mariadb-dump","root/usr/bin/mysqldump");
-safe_symlink("/usr/bin/mariadb-check","root/usr/bin/mysqlcheck");
+#safe_symlink("/usr/bin/mariadb-dumpslow","root/usr/bin/mysqldumpslow");
-safe_symlink("/usr/bin/mariadb-admin","root/usr/bin/mysqladmin");
+#safe_symlink("/usr/bin/mariadb-check","root/usr/bin/mysqlcheck");
-safe_symlink("/usr/bin/mariadb-show","root/usr/bin/mysqlshow");
+#safe_symlink("/usr/bin/mariadb-admin","root/usr/bin/mysqladmin");
-safe_symlink("/usr/bin/mariadb-upgrade","root/usr/bin/mysql_upgrade");
+#safe_symlink("/usr/bin/mariadb-show","root/usr/bin/mysqlshow");
-safe_symlink("/usr/bin/mariadb","root/usr/bin/mysql");
+#safe_symlink("/usr/bin/mariadb-upgrade","root/usr/bin/mysql_upgrade");
-safe_symlink("/usr/bin/mariadb-access","root/usr/bin/mysqlaccess");
+#safe_symlink("/usr/bin/mariadb","root/usr/bin/mysql");
-safe_symlink("/usr/bin/mariadb-binlog","root/usr/bin/mysqlbinlog");
+#safe_symlink("/usr/bin/mariadb-access","root/usr/bin/mysqlaccess");
-safe_symlink("/usr/bin/mariadb-convert-table-format","root/usr/bin/mysql_convert_table_format");
+#safe_symlink("/usr/bin/mariadb-binlog","root/usr/bin/mysqlbinlog");
-safe_symlink("/usr/bin/mariadb-find-rows","root/usr/bin/mysql_find_rows");
+#safe_symlink("/usr/bin/mariadb-convert-table-format","root/usr/bin/mysql_convert_table_format");
-safe_symlink("/usr/bin/mariadb-fix-extensions","root/usr/bin/mysql_fix_extensions");
+#safe_symlink("/usr/bin/mariadb-find-rows","root/usr/bin/mysql_find_rows");
-safe_symlink("/usr/bin/mariadb-install-db","root/usr/bin/mysql_install_db");
+#safe_symlink("/usr/bin/mariadb-fix-extensions","root/usr/bin/mysql_fix_extensions");
-safe_symlink("/usr/bin/mariadb-embedded","root/usr/bin/mysql_embedded");
+#safe_symlink("/usr/bin/mariadb-install-db","root/usr/bin/mysql_install_db");
+#safe_symlink("/usr/bin/mariadb-embedded","root/usr/bin/mysql_embedded");
 
 #--------------------------------------------------
 # pre-backup actions
@@ -80,6 +81,13 @@ foreach (qw(
     templates2events("$_", $event);
 }
 
+#--------------------------------------------------
+# actions for post-install event
+#--------------------------------------------------
+$event = "post-install";
+
+event_link("mysql-update-innodb-page-size", $event, "03");
+
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb");
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog");

root/etc/e-smith/events/actions/mysql-update-innodb-page-size

@@ -0,0 +1,21 @@
+#!/bin/sh
+event=$1
+# check event is defined or return
+[[ -z "$event" ]] && exit 0
+# check we run as post-install event or return
+[[ "$event" == "post-install" ]] || exit 0
+# check mariadb is not running or return
+/usr/bin/pgrep  mariadbd && exit 0
+# ONLY delete the mysql data dirictory if it is initial state
+# we assume if only mysql, test, sys and performance_schema this is the case
+validdirs="/var/lib/mysql/mysql/ /var/lib/mysql/performance_schema/ /var/lib/mysql/sys/ /var/lib/mysql/test/"
+for dir in $(ls -d /var/lib/mysql/*/) ; do
+    [[ $(echo ${validdirs} | grep ${dir}) ]] || exit 0
+done
+
+# we should be safe to reset dir content
+# we use find as glob will ignore dot starting filename
+# rm -rf /var/lib/mysql/*
+find /var/lib/mysql -mindepth 1 -maxdepth 1 -print0 | xargs -0 rm -rf
+exit 0
+

root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs

@@ -14,7 +14,7 @@ do
   if [ -f /run/mariadb/mariadb.pid ]
   then
       /bin/rm /home/e-smith/db/mysql/mysql.dump
-      [ -f /home/e-smith/db/mysql/mysql.privileges.dump ] /bin/rm /home/e-smith/db/mysql/mysql.privileges.dump
+      [ -f /home/e-smith/db/mysql/mysql.privileges.dump ] && /bin/rm /home/e-smith/db/mysql/mysql.privileges.dump
       exit 0
   fi
   echo waiting for mariadb to restart

smeserver-mysql.spec

@@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mysql configuration and templates.
 %define name smeserver-mysql
 Name: %{name}
 %define version 11.0.0
-%define release 14
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -36,6 +36,8 @@ Requires: MariaDB-gssapi-server
 # not available after 10.x
 #Requires: MariaDB-compat
 Requires: mariadb-common ,mariadb-errmsg,mariadb-server-utils
+Requires: MariaDB-client-compat
+Requires: MariaDB-server-compat
 
 AutoReqProv: no
 
@@ -79,7 +81,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %changelog
-* Sun Apr 20 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-14.sme
+* Mon Jul 21 2025 Trevor Batley <trevor@batley.id.au> 11.0.0-18.sme
+- add fix to allow upgrade of innodb to new pagesize as required by 12982 on install [SME: 13083]
+
+* Thu Jun 05 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-17.sme
+- fix conflict with MariaDB-server-compat [SME: 13024]
+
+* Wed May 14 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-16.sme
+- fix conflict with MariaDB-client-compat [SME: 13005]
+
+* Sun Apr 20 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-15.sme
 - set innodb_page_size=64k [SME: 12982]
   breaking change, needs backup and restore of mariadb databases
 - convert mysql* bins call to mariadb-* [SME: 12983]