--- rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch	2022/03/16 07:29:20	1.8
+++ rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch	2022/06/07 12:30:17	1.11
@@ -27,7 +27,7 @@ diff -Nur --no-dereference smeserver-mys
 +    # set root password , 104 and above have a different syntax and allow root passwordless access
 +    if [ !!!VER!!! -le  103 ]
 +    then
-+      /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
++      /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password2
 +    fi
      # upgrade does not need to be run on a fresh datadir
      #echo "5.7.24" >"$datadir/mysql_upgrade_info"
@@ -42,7 +42,7 @@ diff -Nur --no-dereference smeserver-mys
 +   # else we set root password anyway ! just to be sure ! 104 and above have a different syntax and allow root passwordless access
 +   if [ !!!VER!!! -le  103 ]
 +   then
-+     /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
++     /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password2
 +   fi
 +   exit 0
  fi
@@ -163,3 +163,17 @@ diff -Nur smeserver-mysql-2.7.0.old/root
 -    /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqldump --ignore-table=mysql.event --single-transaction --add-drop-table -QB "$db" -r /home/e-smith/db/mariadb!!!VER!!!/"$db".dump || onfailure $db
 +    /opt/rh/rh-mariadb!!!VER!!!/root/usr/bin/mysqldump --socket=!!!SOCKET!!! --ignore-table=mysql.event --single-transaction --add-drop-table -QB "$db" -r /home/e-smith/db/mariadb!!!VER!!!/"$db".dump || onfailure $db
  done
+diff -Nur --no-dereference smeserver-mysql-2.7.0.old/rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service smeserver-mysql-2.7.0/rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service
+--- smeserver-mysql-2.7.0.old/rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service	2022-03-16 16:01:25.209000000 -0400
++++ smeserver-mysql-2.7.0/rootscl/usr/lib/systemd/system/mariadb_VER_-mysql.init.service	2022-03-11 15:26:08.000000000 -0500
+@@ -12,8 +12,8 @@
+ KillMode=process
+ GuessMainPID=no
+ RemainAfterExit=yes
++ExecStart=/sbin/e-smith/systemd/mariadb!!!VER!!!-mysql.init start
++ExecStop=/sbin/e-smith/systemd/mariadb!!!VER!!!-mysql.init stop
+-ExecStart=/sbin/e-smith/systemd/mariadb!!!VER!!!-mariadb.init start
+-ExecStop=/sbin/e-smith/systemd/mariadb!!!VER!!!-mariadb.init stop
+ 
+ [Install]
+ WantedBy=sme-server.target