/[smecontribs]/rpms/smeserver-mysql57/contribs10/smeserver-mysql57-2.0.0-bz11877-systemd.patch
ViewVC logotype

Diff of /rpms/smeserver-mysql57/contribs10/smeserver-mysql57-2.0.0-bz11877-systemd.patch

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

Revision 1.1 by jpp, Wed Feb 23 21:13:59 2022 UTC Revision 1.3 by jpp, Wed Feb 23 22:19:15 2022 UTC
# Line 1  Line 1 
1  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/createlinks smeserver-mysql57-2.0.0/createlinks  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/createlinks smeserver-mysql57-2.0.0/createlinks
2  --- smeserver-mysql57-2.0.0.old/createlinks     2022-02-23 14:04:50.137000000 -0500  --- smeserver-mysql57-2.0.0.old/createlinks     2022-02-23 14:04:50.137000000 -0500
3  +++ smeserver-mysql57-2.0.0/createlinks 2022-02-23 15:15:13.931000000 -0500  +++ smeserver-mysql57-2.0.0/createlinks 2022-02-23 17:16:10.633000000 -0500
4  @@ -31,13 +31,16 @@  @@ -31,13 +31,16 @@
5   $event = "bootstrap-console-save";   $event = "bootstrap-console-save";
6    
# Line 23  diff -Nur --no-dereference smeserver-mys Line 23  diff -Nur --no-dereference smeserver-mys
23   }   }
24    
25   # Move all database dumps except for mysql.dump to sql/init   # Move all database dumps except for mysql.dump to sql/init
26  @@ -50,12 +53,9 @@  @@ -50,12 +53,15 @@
27    
28   safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysqld");   safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysqld");
29    
# Line 31  diff -Nur --no-dereference smeserver-mys Line 31  diff -Nur --no-dereference smeserver-mys
31  -       "bootstrap-console-save");  -       "bootstrap-console-save");
32  -  -
33  -safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");  -safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");
34  -  +$event = "smeserver-mysql57-update";
35  +#safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");  +event_link("mysql57-load-tables", $event, "40");
36  +#/var/run/rh-mysql57-mysqld/  +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysqld");
37    +# might be launched before..
38    +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysql.init");
39    +event_link("systemd-reload", $event, "89");
40    +event_link("systemd-default", $event, "88");
41    
42    
43   # link configuration   # link configuration
44   safe_symlink("/etc/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/etc");   safe_symlink("/etc/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/etc");
45  -safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var");  -safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var");
46  \ Pas de fin de ligne à la fin du fichier  \ Pas de fin de ligne à la fin du fichier
47  +safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var");  +safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var");
48    diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-delete-db-files smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-delete-db-files
49    --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-delete-db-files 2022-02-23 14:04:50.076000000 -0500
50    +++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-delete-db-files     2022-02-23 16:31:55.730000000 -0500
51    @@ -1,3 +1,3 @@
52     #! /bin/sh
53    
54    -cd /opt/rh/rh-mysql57/root/var/lib/mysql && find . -type f | xargs rm -f
55    +cd /var/opt/rh/rh-mysql57/lib/mysql && find . -type f | xargs rm -f
56    diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables
57    --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables     2022-02-23 14:04:50.385000000 -0500
58    +++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables 2022-02-23 16:32:24.143000000 -0500
59    @@ -7,7 +7,7 @@
60         exit 0
61     fi
62     /bin/rm -f /home/e-smith/db/mysql57/information_schema.dump
63    -if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/mysql/user.frm ]
64    +if [ ! -f /var/opt/rh/rh-mysql57/lib/mysql/mysql/user.frm ]
65     then
66         for db in $(ls /home/e-smith/db/mysql57/*.dump 2> /dev/null | grep -v '/mysql.dump')
67         do
68  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme
69  --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme       1969-12-31 19:00:00.000000000 -0500  --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme       1969-12-31 19:00:00.000000000 -0500
70  +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme   2022-02-23 14:04:50.102000000 -0500  +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme   2022-02-23 14:04:50.102000000 -0500
# Line 102  diff -Nur --no-dereference smeserver-mys Line 127  diff -Nur --no-dereference smeserver-mys
127  +basedir=/opt/rh/rh-mysql57/root/usr  +basedir=/opt/rh/rh-mysql57/root/usr
128  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir
129  --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir      1969-12-31 19:00:00.000000000 -0500  --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir      1969-12-31 19:00:00.000000000 -0500
130  +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir  2022-02-23 14:04:50.104000000 -0500  +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir  2022-02-23 16:33:12.118000000 -0500
131  @@ -0,0 +1 @@  @@ -0,0 +1 @@
132  +datadir=/opt/rh/rh-mysql57/root/var/lib/mysql  +datadir=/var/opt/rh/rh-mysql57/lib/mysql
133  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir
134  --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir       1969-12-31 19:00:00.000000000 -0500  --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir       1969-12-31 19:00:00.000000000 -0500
135  +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir   2022-02-23 14:04:50.144000000 -0500  +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir   2022-02-23 14:04:50.144000000 -0500
# Line 341  diff -Nur --no-dereference smeserver-mys Line 366  diff -Nur --no-dereference smeserver-mys
366  -exit 1  -exit 1
367  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-initialize smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize  diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-initialize smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize
368  --- smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-initialize    1969-12-31 19:00:00.000000000 -0500  --- smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-initialize    1969-12-31 19:00:00.000000000 -0500
369  +++ smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize        2022-02-23 15:34:09.812000000 -0500  +++ smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize        2022-02-23 16:31:21.174000000 -0500
370  @@ -0,0 +1,32 @@  @@ -0,0 +1,32 @@
371  +#!/bin/bash  +#!/bin/bash
372  +datadir="/opt/rh/rh-mysql57/root/var/lib/mysql"  +datadir="/var/opt/rh/rh-mysql57/lib/mysql"
373  +  +
374  +if [ ! -f /var/opt/rh/rh-mysql57/lib/mysql/mysql/user.frm ]  +if [ ! -f $datadir/mysql/user.frm ]
375  +then  +then
376  +    touch /var/log/mysql57-mysqld.log  +    touch /var/log/mysql57-mysqld.log
377  +    chown mysql:mysql /var/log/mysql57-mysqld.log  +    chown mysql:mysql /var/log/mysql57-mysqld.log

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