/[smeserver]/rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-bz11120-mysql.init2systemd.patch
ViewVC logotype

Contents of /rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-bz11120-mysql.init2systemd.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (show annotations) (download)
Thu Dec 10 04:25:50 2020 UTC (3 years, 10 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-mysql-2_6_0-16_el7_sme
Changes since 1.1: +14 -0 lines
* Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
- fix issue with 10mysql_upgrade crashing mariadb [SME: 11120]
  also removed noise from spec file

1 diff -Nur e-smith-mysql-2.6.0.old/root/usr/lib/systemd/system/mysql.init.service e-smith-mysql-2.6.0/root/usr/lib/systemd/system/mysql.init.service
2 --- e-smith-mysql-2.6.0.old/root/usr/lib/systemd/system/mysql.init.service 1969-12-31 19:00:00.000000000 -0500
3 +++ e-smith-mysql-2.6.0/root/usr/lib/systemd/system/mysql.init.service 2020-12-07 22:37:53.569000000 -0500
4 @@ -0,0 +1,19 @@
5 +[Unit]
6 +SourcePath=/etc/rc.d/init.d/mysql.init
7 +Description=Koozali SME Server mysql DB injector for mariadb
8 +After=mariadb.service
9 +Requires=mariadb.service
10 +
11 +[Service]
12 +Type=oneshot
13 +Restart=no
14 +TimeoutSec=10min
15 +IgnoreSIGPIPE=no
16 +KillMode=process
17 +GuessMainPID=no
18 +RemainAfterExit=yes
19 +ExecStart=/etc/rc.d/init.d/mysql.init start
20 +ExecStop=/etc/rc.d/init.d/mysql.init stop
21 +
22 +[Install]
23 +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 ]

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed