21 |
+ |
+ |
22 |
+[Install] |
+[Install] |
23 |
+WantedBy=sme-server.target |
+WantedBy=sme-server.target |
24 |
|
diff -Nur e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade |
25 |
|
--- e-smith-mysql-2.6.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade 2020-12-09 23:20:20.435000000 -0500 |
26 |
|
+++ e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/10mysql_upgrade 2020-12-09 23:23:42.874000000 -0500 |
27 |
|
@@ -1,9 +1,8 @@ |
28 |
|
#!/bin/sh |
29 |
|
/usr/bin/mysql_upgrade |
30 |
|
|
31 |
|
-P=$(cat /var/run/mariadb/mariadb.pid) |
32 |
|
/bin/rm /var/run/mariadb/mariadb.pid |
33 |
|
-kill -TERM $P |
34 |
|
+/usr/bin/systemctl restart mariadb.service |
35 |
|
for i in $(seq 1 20); |
36 |
|
do |
37 |
|
if [ -f /var/run/mariadb/mariadb.pid ] |
38 |
|
diff -Nur e-smith-mysql-2.6.0.old/createlinks e-smith-mysql-2.6.0/createlinks |
39 |
|
--- e-smith-mysql-2.6.0.old/createlinks 2020-12-13 17:05:15.553000000 -0500 |
40 |
|
+++ e-smith-mysql-2.6.0/createlinks 2020-12-13 17:07:11.467000000 -0500 |
41 |
|
@@ -67,9 +67,10 @@ |
42 |
|
} |
43 |
|
|
44 |
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb"); |
45 |
|
- |
46 |
|
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); |
47 |
|
# Move all database dumps except for mysql.dump to sql/init |
48 |
|
event_link("mysql-load-tables", $event, "40"); |
49 |
|
+templates2events("/etc/e-smith/sql/init/10mysql_upgrade", $event); |
50 |
|
|
51 |
|
# systemd-specific action mandatory for this package-update event |
52 |
|
event_link("systemd-reload", $event, "89"); |