--- rpms/smeserver-mysql57/contribs10/smeserver-mysql57-2.0.0-bz11877-systemd.patch	2022/02/23 21:13:59	1.1
+++ rpms/smeserver-mysql57/contribs10/smeserver-mysql57-2.0.0-bz11877-systemd.patch	2022/02/23 22:19:15	1.3
@@ -1,6 +1,6 @@
 diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/createlinks smeserver-mysql57-2.0.0/createlinks
 --- smeserver-mysql57-2.0.0.old/createlinks	2022-02-23 14:04:50.137000000 -0500
-+++ smeserver-mysql57-2.0.0/createlinks	2022-02-23 15:15:13.931000000 -0500
++++ smeserver-mysql57-2.0.0/createlinks	2022-02-23 17:16:10.633000000 -0500
 @@ -31,13 +31,16 @@
  $event = "bootstrap-console-save";
  
@@ -23,7 +23,7 @@ diff -Nur --no-dereference smeserver-mys
  }
  
  # Move all database dumps except for mysql.dump to sql/init
-@@ -50,12 +53,9 @@
+@@ -50,12 +53,15 @@
  
  safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysqld");
  
@@ -31,15 +31,40 @@ diff -Nur --no-dereference smeserver-mys
 -	"bootstrap-console-save");
 -
 -safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");
--
-+#safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");
-+#/var/run/rh-mysql57-mysqld/
++$event = "smeserver-mysql57-update";
++event_link("mysql57-load-tables", $event, "40");
++safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysqld");
++# might be launched before..
++safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysql.init");
++event_link("systemd-reload", $event, "89");
++event_link("systemd-default", $event, "88");
+ 
  
  # link configuration
  safe_symlink("/etc/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/etc");
 -safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var");
 \ Pas de fin de ligne à la fin du fichier
 +safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var");
+diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-delete-db-files smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-delete-db-files
+--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-delete-db-files	2022-02-23 14:04:50.076000000 -0500
++++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-delete-db-files	2022-02-23 16:31:55.730000000 -0500
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+ 
+-cd /opt/rh/rh-mysql57/root/var/lib/mysql && find . -type f | xargs rm -f
++cd /var/opt/rh/rh-mysql57/lib/mysql && find . -type f | xargs rm -f
+diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables
+--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables	2022-02-23 14:04:50.385000000 -0500
++++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables	2022-02-23 16:32:24.143000000 -0500
+@@ -7,7 +7,7 @@
+     exit 0
+ fi
+ /bin/rm -f /home/e-smith/db/mysql57/information_schema.dump
+-if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/mysql/user.frm ]
++if [ ! -f /var/opt/rh/rh-mysql57/lib/mysql/mysql/user.frm ]
+ then
+     for db in $(ls /home/e-smith/db/mysql57/*.dump 2> /dev/null | grep -v '/mysql.dump')
+     do
 diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme
 --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme	1969-12-31 19:00:00.000000000 -0500
 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme	2022-02-23 14:04:50.102000000 -0500
@@ -102,9 +127,9 @@ diff -Nur --no-dereference smeserver-mys
 +basedir=/opt/rh/rh-mysql57/root/usr
 diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir
 --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir	1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir	2022-02-23 14:04:50.104000000 -0500
++++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir	2022-02-23 16:33:12.118000000 -0500
 @@ -0,0 +1 @@
-+datadir=/opt/rh/rh-mysql57/root/var/lib/mysql
++datadir=/var/opt/rh/rh-mysql57/lib/mysql
 diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir
 --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir	1969-12-31 19:00:00.000000000 -0500
 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir	2022-02-23 14:04:50.144000000 -0500
@@ -341,12 +366,12 @@ diff -Nur --no-dereference smeserver-mys
 -exit 1
 diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-initialize smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize
 --- smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-initialize	1969-12-31 19:00:00.000000000 -0500
-+++ smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize	2022-02-23 15:34:09.812000000 -0500
++++ smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize	2022-02-23 16:31:21.174000000 -0500
 @@ -0,0 +1,32 @@
 +#!/bin/bash
-+datadir="/opt/rh/rh-mysql57/root/var/lib/mysql"
++datadir="/var/opt/rh/rh-mysql57/lib/mysql"
 +
-+if [ ! -f /var/opt/rh/rh-mysql57/lib/mysql/mysql/user.frm ]
++if [ ! -f $datadir/mysql/user.frm ]
 +then
 +    touch /var/log/mysql57-mysqld.log
 +    chown mysql:mysql /var/log/mysql57-mysqld.log