/[smecontribs]/rpms/smeserver-mysql57/contribs9/smeserver-mysql57-2.0.0-SME10147-rhpath.patch
ViewVC logotype

Annotation of /rpms/smeserver-mysql57/contribs9/smeserver-mysql57-2.0.0-SME10147-rhpath.patch

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

Revision 1.1 - (hide annotations) (download)
Sun Mar 12 22:03:57 2017 UTC (7 years, 8 months ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-mysql57-2_0_0-12_el6_sme, smeserver-mysql57-2_0_0-9_el6_sme, smeserver-mysql57-2_0_0-11_el6_sme, smeserver-mysql57-2_0_0-6_el6_sme, smeserver-mysql57-2_0_0-7_el6_sme, smeserver-mysql57-2_0_0-8_el6_sme, smeserver-mysql57-2_0_0-10_el6_sme, HEAD 
* Sun Mar 12 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.0.0-6.sme
- fix wrong path /opt/rh/mysql57/ [SME: 10147]
1 unnilennium 1.1 diff -Nur smeserver-mysql57-2.0.0.old/createlinks smeserver-mysql57-2.0.0/createlinks
2     --- smeserver-mysql57-2.0.0.old/createlinks 2017-02-19 09:44:53.000000000 -0500
3     +++ smeserver-mysql57-2.0.0/createlinks 2017-03-12 17:58:15.441000000 -0400
4     @@ -31,8 +31,8 @@
5     $event = "bootstrap-console-save";
6    
7     foreach (qw(
8     - /opt/rh/mysql57/root/etc/my.cnf
9     - /opt/rh/mysql57/root/etc/sysconfig/mysqld
10     + /opt/rh/rh-mysql57/root/etc/my.cnf
11     + /opt/rh/rh-mysql57/root/etc/sysconfig/mysqld
12     /var/service/mysql57-mysqld/set.password
13     ))
14     # /root/.my.cnf
15     @@ -53,4 +53,4 @@
16     templates2events("/etc/e-smith/sql/init57/10fix_privilege_tables",
17     "bootstrap-console-save");
18    
19     -safe_symlink("/opt/rh/mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");
20     +safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");
21     diff -Nur 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
22     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-delete-db-files 2017-02-19 09:44:53.000000000 -0500
23     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-delete-db-files 2017-03-12 17:58:15.440000000 -0400
24     @@ -1,3 +1,3 @@
25     #! /bin/sh
26    
27     -cd /opt/rh/mysql57/root/var/lib/mysql && find . -type f | xargs rm -f
28     +cd /opt/rh/rh-mysql57/root/var/lib/mysql && find . -type f | xargs rm -f
29     diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-dump-tables smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-dump-tables
30     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-dump-tables 2017-02-19 09:44:53.000000000 -0500
31     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-dump-tables 2017-03-12 17:58:15.440000000 -0400
32     @@ -6,7 +6,7 @@
33     echo "mysql57-mysqld is disabled - no tables dumped" >&2
34     exit 0
35     fi
36     -for db in $(/opt/rh/mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock -BNre "show databases;")
37     +for db in $(/opt/rh/rh-mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock -BNre "show databases;")
38     do
39     - /opt/rh/mysql57/root/usr/bin/mysqldump --single-transaction --socket=/var/lib/mysql/mysql57.sock --add-drop-table -QB "$db" -r /home/e-smith/db/mysql57/"$db".dump || exit 1
40     + /opt/rh/rh-mysql57/root/usr/bin/mysqldump --single-transaction --socket=/var/lib/mysql/mysql57.sock --add-drop-table -QB "$db" -r /home/e-smith/db/mysql57/"$db".dump || exit 1
41     done
42     diff -Nur 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
43     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables 2017-02-19 09:44:53.000000000 -0500
44     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables 2017-03-12 17:58:15.440000000 -0400
45     @@ -6,7 +6,7 @@
46     echo "mysqld is disabled - no tables restored" >&2
47     exit 0
48     fi
49     -if [ ! -f /opt/rh/mysql57/root/var/lib/mysql/user.frm ]
50     +if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/user.frm ]
51     then
52     for db in $(ls /home/e-smith/db/mysql57/*.dump 2> /dev/null | grep -v '/mysql.dump')
53     do
54     diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs
55     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs 2017-02-19 09:44:53.000000000 -0500
56     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/00_restore_dumped_dbs 2017-03-12 17:58:15.441000000 -0400
57     @@ -1,13 +1,13 @@
58     #! /bin/sh
59    
60     ( cat /home/e-smith/db/mysql57/mysql.dump ;
61     - cat /service/mysql57-mysqld/set.password ) | /opt/rh/mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock || exit 1
62     -P=$(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
63     -/bin/rm /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid
64     + cat /service/mysql57-mysqld/set.password ) | /opt/rh/rh-mysql57/root/usr/bin/mysql --socket=/var/lib/mysql/mysql57.sock || exit 1
65     +P=$(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
66     +/bin/rm /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid
67     kill -TERM $P
68     for i in $(seq 1 20);
69     do
70     - if [ -f /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid ]
71     + if [ -f /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid ]
72     then
73     /bin/rm /home/e-smith/db/mysql57/mysql.dump
74     exit 0
75     diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables
76     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables 2017-02-19 09:44:53.000000000 -0500
77     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/e-smith/sql/init57/10fix_privilege_tables 2017-03-12 17:58:15.440000000 -0400
78     @@ -1,12 +1,12 @@
79     #!/bin/sh
80    
81     -/opt/rh/mysql57/root/usr/bin/mysql -f mysql < /usr/share/mysql/mysql_fix_privilege_tables.sql
82     -P=$(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
83     -/bin/rm /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid
84     +/opt/rh/rh-mysql57/root/usr/bin/mysql -f mysql < /usr/share/mysql/mysql_fix_privilege_tables.sql
85     +P=$(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
86     +/bin/rm /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid
87     kill -TERM $P
88     for i in $(seq 1 20);
89     do
90     - if [ -f /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid ]
91     + if [ -f /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid ]
92     then
93     exit 0
94     fi
95     diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/mysql57-mysqld/50options smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/logrotate.d/mysql57-mysqld/50options
96     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/mysql57-mysqld/50options 2017-02-19 09:44:53.000000000 -0500
97     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/logrotate.d/mysql57-mysqld/50options 2017-03-12 17:58:15.441000000 -0400
98     @@ -8,6 +8,6 @@
99     postrotate
100     # just if mysqld is really running
101     if test -n "`ps ax|grep mysql57|grep -v 'grep'`"; then
102     - /opt/rh/mysql57/root/usr/bin/mysqladmin flush-logs
103     + /opt/rh/rh-mysql57/root/usr/bin/mysqladmin flush-logs
104     fi
105     endscript
106     diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file
107     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file 2017-02-19 09:44:53.000000000 -0500
108     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file 2017-03-12 17:58:15.440000000 -0400
109     @@ -1 +1 @@
110     -pid-file=/opt/rh/mysql57/root/var/run/mysqld/mysqld.pid
111     +pid-file=/opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid
112     diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir
113     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir 2017-02-19 09:44:53.000000000 -0500
114     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir 2017-03-12 17:58:15.440000000 -0400
115     @@ -1 +1 @@
116     -basedir=/opt/rh/mysql57/root/usr
117     +basedir=/opt/rh/rh-mysql57/root/usr
118     diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir
119     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir 2017-02-19 09:44:53.000000000 -0500
120     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir 2017-03-12 17:58:15.440000000 -0400
121     @@ -1 +1 @@
122     -datadir=/opt/rh/mysql57/root/var/lib/mysql
123     +datadir=/opt/rh/rh-mysql57/root/var/lib/mysql
124     diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe
125     --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe 2017-02-19 09:44:53.000000000 -0500
126     +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe 2017-03-12 17:58:15.440000000 -0400
127     @@ -1,4 +1,4 @@
128    
129     { # allow backwards-compatibility with safe_mysqld (mysql < 4.0)
130     - -f "/opt/rh/mysql57/root/usr/bin/mysqld_safe" ? "[mysqld_safe]" : "[safe_mysqld]";
131     + -f "/opt/rh/rh-mysql57/root/usr/bin/mysqld_safe" ? "[mysqld_safe]" : "[safe_mysqld]";
132     }
133     diff -Nur smeserver-mysql57-2.0.0.old/root/sbin/e-smith/mysql57-preload smeserver-mysql57-2.0.0/root/sbin/e-smith/mysql57-preload
134     --- smeserver-mysql57-2.0.0.old/root/sbin/e-smith/mysql57-preload 2017-02-19 09:44:53.000000000 -0500
135     +++ smeserver-mysql57-2.0.0/root/sbin/e-smith/mysql57-preload 2017-03-12 17:58:15.439000000 -0400
136     @@ -40,9 +40,9 @@
137     else
138     {
139     # Find our mysqld binary
140     - my $mysqld = "/opt/rh/mysql57/root/usr/libexec/mysqld --socket=/var/lib/mysql/mysql57.sock";
141     - if (-f "/opt/rh/mysql57/root/usr/sbin/mysqld") {
142     - $mysqld = "/opt/rh/mysql57/root/usr/sbin/mysqld --socket=/var/lib/mysql/mysql57.sock";
143     + my $mysqld = "/opt/rh/rh-mysql57/root/usr/libexec/mysqld --socket=/var/lib/mysql/mysql57.sock";
144     + if (-f "/opt/rh/rh-mysql57/root/usr/sbin/mysqld") {
145     + $mysqld = "/opt/rh/rh-mysql57/root/usr/sbin/mysqld --socket=/var/lib/mysql/mysql57.sock";
146     }
147     # Hard-code user, since it is set in mysqld_safe currently.
148     # See http://bugs.mysql.com/2163
149     diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/d smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/d
150     --- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/d 2017-02-19 09:44:53.000000000 -0500
151     +++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/d 2017-03-12 17:58:15.439000000 -0400
152     @@ -1,3 +1,3 @@
153     #! /bin/sh
154    
155     -exec kill -TERM $(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
156     +exec kill -TERM $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
157     diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/i smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/i
158     --- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/i 2017-02-19 09:44:53.000000000 -0500
159     +++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/i 2017-03-12 17:58:15.439000000 -0400
160     @@ -1,3 +1,3 @@
161     #! /bin/sh
162    
163     -exec kill -INT $(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
164     +exec kill -INT $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
165     diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/q smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/q
166     --- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/q 2017-02-19 09:44:53.000000000 -0500
167     +++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/q 2017-03-12 17:58:15.440000000 -0400
168     @@ -1,3 +1,3 @@
169     #! /bin/sh
170    
171     -exec kill -QUIT $(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
172     +exec kill -QUIT $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
173     diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/t smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/t
174     --- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/t 2017-02-19 09:44:53.000000000 -0500
175     +++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/t 2017-03-12 17:58:15.440000000 -0400
176     @@ -1,3 +1,3 @@
177     #! /bin/sh
178    
179     -exec kill -TERM $(cat /opt/rh/mysql57/root/var/run/mysqld/mysqld.pid)
180     +exec kill -TERM $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
181     diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/run smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/run
182     --- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/run 2017-02-19 09:44:53.000000000 -0500
183     +++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/run 2017-03-12 17:58:15.439000000 -0400
184     @@ -4,7 +4,7 @@
185     # clears almost all environment variables.
186     # Since X_SCLS is cleared as well, we lose information about other
187     # collections enabled.
188     -. /opt/rh/mysql57/service-environment
189     +. /opt/rh/rh-mysql57/service-environment
190     for sclname in $MYSQL57_SCLS_ENABLED ; do
191     . /opt/rh/$sclname/enable
192     export X_SCLS="$X_SCLS $sclname"
193     @@ -12,25 +12,25 @@
194    
195     # we want start daemon only inside "scl enable" invocation
196     if ! scl_enabled mysql57 ; then
197     - echo "Collection mysql57 has to be listed in /opt/rh/mysql57/service-environment"
198     + echo "Collection mysql57 has to be listed in /opt/rh/rh-mysql57/service-environment"
199     exit 1
200     fi
201    
202     exec 2>&1
203     -if [ ! -f /opt/rh/mysql57/root/var/lib/mysql/mysql/user.frm ]
204     +if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/mysql/user.frm ]
205     then
206     - setuidgid mysql sh /opt/rh/mysql57/root/usr/bin/mysql_install_db
207     - /opt/rh/mysql57/root/usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables --socket=/var/lib/mysql/mysql57.sock < ./set.password
208     + setuidgid mysql sh /opt/rh/rh-mysql57/root/usr/bin/mysql_install_db
209     + /opt/rh/rh-mysql57/root/usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables --socket=/var/lib/mysql/mysql57.sock < ./set.password
210     if [ -f /home/e-smith/db/mysql57/mysql.dump ]
211     then
212     /sbin/e-smith/expand-template /etc/e-smith/sql/init57/00_restore_dumped_dbs
213     fi
214     fi
215    
216     -exec /opt/rh/mysql57/root/usr/libexec/mysqld \
217     - --defaults-file=/opt/rh/mysql57/root/etc/my.cnf \
218     - --basedir=/opt/rh/mysql57/root/usr \
219     - --datadir=/opt/rh/mysql57/root/var/lib/mysql \
220     +exec /opt/rh/rh-mysql57/root/usr/libexec/mysqld \
221     + --defaults-file=/opt/rh/rh-mysql57/root/etc/my.cnf \
222     + --basedir=/opt/rh/rh-mysql57/root/usr \
223     + --datadir=/opt/rh/rh-mysql57/root/var/lib/mysql \
224     --user=mysql \
225     - --pid-file=/opt/rh/mysql57/root/var/run/mysqld/mysqld.pid \
226     + --pid-file=/opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid \
227     --socket=/var/lib/mysql/mysql57.sock
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed