--- rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2020/12/08 02:55:37	1.15
+++ rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2020/12/08 03:26:23	1.16
@@ -1,4 +1,4 @@
-# $Id: e-smith-mysql.spec,v 1.14 2016/07/24 15:20:03 unnilennium Exp $
+# $Id: e-smith-mysql.spec,v 1.15 2020/12/08 02:55:37 jpp Exp $
 
 Summary: e-smith specific mysql configuration and templates.
 %define name e-smith-mysql
@@ -17,6 +17,7 @@ Patch3: e-smith-mysql-2.6.0-mariadb_forg
 Patch4: e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch 
 Patch5: e-smith-mysql-2.6.0.bz9688.skipredirect.patch
 Patch6: e-smith-mysql-2.6.0-bz11145-updateevent.patch
+Patch7: e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -786,6 +787,13 @@ rm -f root/etc/rc.d/rc7.d/S50mysqld
 
 mkdir -p root/var/log/mariadb.run
 %patch6 -p1
+# move mariadb to systemd
+%patch7 -p1
+rm -rf root/etc/e-smith/templates.metadata/var/service
+rm -rf root/etc/e-smith/templates/var/service/mariadb
+rm -rf root/var/service
+rm -rf root/service
+rm -rf root/etc/rc.d/init.d/supervise
 
 
 %build
@@ -795,6 +803,7 @@ perl createlinks
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+    --file /sbin/e-smith/systemd/mariadb-initialize 'attr(0554,root,root)' \
     --file /var/service/mariadb/run 'attr(0755,root,root)' \
     --file /var/service/mariadb/control/t 'attr(0750,root,root)' \
     --file /var/service/mariadb/control/d 'attr(0750,root,root)' \
@@ -809,6 +818,14 @@ echo "%doc COPYING"          >> %{name}-
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/mariadb/run ] ; then
+	/usr/bin/sv d mariadb
+	/usr/bin/sv d mariadb/log
+  fi
+fi
+
 %post
 
 %postun