e-smith-mysql/sme10/e-smith-mysql-2.6.0.bz11453-sme9restoreerror.patch

diff -urN e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs       2021-03-13 08:59:01.539834698 -0500
+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs   2021-03-13 09:00:22.000000000 -0500
@@ -3,9 +3,8 @@
 ( cat /home/e-smith/db/mysql/mysql.dump ;
   cat /service/mariadb/set.password ) | mysql || exit 1
 /usr/bin/mysql_upgrade
-P=$(cat /var/run/mariadb/mariadb.pid)
 /bin/rm /var/run/mariadb/mariadb.pid
-kill -TERM $P
+/usr/bin/systemctl restart mariadb.service
 for i in $(seq 1 20);
 do
   if [ -f /var/run/mariadb/mariadb.pid ]
1	terryfage	1.1	diff -urN e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs
2			--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs 2021-03-13 08:59:01.539834698 -0500
3			+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs 2021-03-13 09:00:22.000000000 -0500
4			@@ -3,9 +3,8 @@
5			( cat /home/e-smith/db/mysql/mysql.dump ;
6			cat /service/mariadb/set.password ) \| mysql \|\| exit 1
7			/usr/bin/mysql_upgrade
8			-P=$(cat /var/run/mariadb/mariadb.pid)
9			/bin/rm /var/run/mariadb/mariadb.pid
10			-kill -TERM $P
11			+/usr/bin/systemctl restart mariadb.service
12			for i in $(seq 1 20);
13			do
14			if [ -f /var/run/mariadb/mariadb.pid ]