--- rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch	2020/12/08 03:26:23	1.1
+++ rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch	2020/12/08 04:40:30	1.3
@@ -102,13 +102,13 @@ diff -Nur e-smith-mysql-2.6.0.old/root/u
 +
 +[Service]
 +Type=simple
-+User=mysql
-+Group=mysql
++User=root
++Group=root
 +
 +#reset
 +ExecStartPre=
-+#ours
-+ExecStartPre=/sbin/e-smith/expand-template /var/lib/mysql/set.password
++#ours : we need root user as + and ! are not yet supported
++ExecStartPre=-/sbin/e-smith/expand-template /var/lib/mysql/set.password
 +ExecStartPre=-/sbin/e-smith/expand-template /root/.my.cnf
 +ExecStartPre=-/sbin/e-smith/expand-template /etc/my.cnf
 +ExecStartPre=/sbin/e-smith/systemd/mariadb-initialize
@@ -116,7 +116,7 @@ diff -Nur e-smith-mysql-2.6.0.old/root/u
 +#reset
 +ExecStart=
 +#ours
-+ExecStart=exec /usr/libexec/mysqld \
++ExecStart=/usr/libexec/mysqld \
 + --defaults-file=/etc/my.cnf \
 +  --basedir=/usr \
 +   --datadir=/var/lib/mysql \
@@ -126,7 +126,7 @@ diff -Nur e-smith-mysql-2.6.0.old/root/u
 +#reset
 +ExecStartPost=
 +#ours
-+ExecStartPost=/usr/libexec/mariadb-wait-ready /var/run/mariadb/mariadb.pid
++ExecStartPost=/usr/libexec/mariadb-wait-ready $MAINPID
 +
 +# Give a reasonable amount of time for the server to start up/shut down
 +TimeoutSec=300