--- rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch	2022/03/14 05:05:33	1.6
+++ rpms/smeserver-mysql/sme10/smeserver-mysql-2.7.0-bz11899-sclo.patch	2022/03/14 06:40:49	1.7
@@ -112,25 +112,25 @@ diff -Nur --no-dereference smeserver-mys
 +PERMS=0400
 +UID="root"
 +GID="root"
-diff -Nur --no-dereference smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize
---- smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize	2022-03-14 00:10:47.160000000 -0400
-+++ smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-initialize	2022-03-14 01:01:42.194000000 -0400
-@@ -38,6 +38,8 @@
-     if [ !!!VER!!! -le  103 ]
-     then
-       /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
-+    else
-+     /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"
-@@ -53,6 +55,9 @@
-    if [ !!!VER!!! -le  103 ]
-    then
-      /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password
-+   else
-+     /opt/rh/rh-mariadb!!!VER!!!/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < /var/lib/mysql/set.password2
-    fi
+diff -Nur --no-dereference smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-post smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-post
+--- smeserver-mysql-2.7.0.old/rootscl/sbin/e-smith/systemd/mariadb_VER_-post	1969-12-31 19:00:00.000000000 -0500
++++ smeserver-mysql-2.7.0/rootscl/sbin/e-smith/systemd/mariadb_VER_-post	2022-03-14 02:28:09.537000000 -0400
+@@ -0,0 +1,18 @@
++#!/bin/bash
++
++for i in $(seq 1 20);
++do
++  if [ -S !!!SOCKET!!! ]
++  then
++      /usr/bin/mysql!!!VER!!! < /var/lib/mysql/set.password2
++      echo  "root password set"
++      exit 0
++  fi
++  echo waiting for rh-mariadb105-mariadb to start to set root password
++  sleep 1
++done
++echo  failed to set root password
++# we fail silently, mariadb will still work, only issue is for phpmyadmin
++# and non socket access
++exit 0
 +
-    exit 0
- fi