/[smeserver]/rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch
ViewVC logotype

Diff of /rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch

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

Revision 1.1 by jpp, Tue Dec 8 03:26:23 2020 UTC Revision 1.4 by jpp, Tue Dec 8 19:57:09 2020 UTC
# Line 94  diff -Nur e-smith-mysql-2.6.0.old/root/s Line 94  diff -Nur e-smith-mysql-2.6.0.old/root/s
94  diff -Nur e-smith-mysql-2.6.0.old/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf e-smith-mysql-2.6.0/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf  diff -Nur e-smith-mysql-2.6.0.old/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf e-smith-mysql-2.6.0/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf
95  --- e-smith-mysql-2.6.0.old/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf        1969-12-31 19:00:00.000000000 -0500  --- e-smith-mysql-2.6.0.old/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf        1969-12-31 19:00:00.000000000 -0500
96  +++ e-smith-mysql-2.6.0/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf    2020-12-07 21:59:46.298000000 -0500  +++ e-smith-mysql-2.6.0/root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf    2020-12-07 21:59:46.298000000 -0500
97  @@ -0,0 +1,42 @@  @@ -0,0 +1,43 @@
98  +[Unit]  +[Unit]
99  +Description=MariaDB database server  +Description=MariaDB database server
100  +After=syslog.target  +After=syslog.target
# Line 102  diff -Nur e-smith-mysql-2.6.0.old/root/u Line 102  diff -Nur e-smith-mysql-2.6.0.old/root/u
102  +  +
103  +[Service]  +[Service]
104  +Type=simple  +Type=simple
105  +User=mysql  +User=root
106  +Group=mysql  +Group=root
107  +  +
108  +#reset  +#reset
109  +ExecStartPre=  +ExecStartPre=
110  +#ours  +#ours : we need root user as + and ! are not yet supported
111  +ExecStartPre=/sbin/e-smith/expand-template /var/lib/mysql/set.password  +ExecStartPre=-/sbin/e-smith/service-status mariadb
112    +ExecStartPre=-/sbin/e-smith/expand-template /var/lib/mysql/set.password
113  +ExecStartPre=-/sbin/e-smith/expand-template /root/.my.cnf  +ExecStartPre=-/sbin/e-smith/expand-template /root/.my.cnf
114  +ExecStartPre=-/sbin/e-smith/expand-template /etc/my.cnf  +ExecStartPre=-/sbin/e-smith/expand-template /etc/my.cnf
115  +ExecStartPre=/sbin/e-smith/systemd/mariadb-initialize  +ExecStartPre=/sbin/e-smith/systemd/mariadb-initialize
# Line 116  diff -Nur e-smith-mysql-2.6.0.old/root/u Line 117  diff -Nur e-smith-mysql-2.6.0.old/root/u
117  +#reset  +#reset
118  +ExecStart=  +ExecStart=
119  +#ours  +#ours
120  +ExecStart=exec /usr/libexec/mysqld \  +ExecStart=/usr/libexec/mysqld \
121  + --defaults-file=/etc/my.cnf \  + --defaults-file=/etc/my.cnf \
122  +  --basedir=/usr \  +  --basedir=/usr \
123  +   --datadir=/var/lib/mysql \  +   --datadir=/var/lib/mysql \
# Line 126  diff -Nur e-smith-mysql-2.6.0.old/root/u Line 127  diff -Nur e-smith-mysql-2.6.0.old/root/u
127  +#reset  +#reset
128  +ExecStartPost=  +ExecStartPost=
129  +#ours  +#ours
130  +ExecStartPost=/usr/libexec/mariadb-wait-ready /var/run/mariadb/mariadb.pid  +ExecStartPost=/usr/libexec/mariadb-wait-ready $MAINPID
131  +  +
132  +# Give a reasonable amount of time for the server to start up/shut down  +# Give a reasonable amount of time for the server to start up/shut down
133  +TimeoutSec=300  +TimeoutSec=300

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed