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

Annotation of /rpms/e-smith-mysql/sme10/e-smith-mysql-2.6.0-mysqld2mariadb.patch

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

Revision 1.1 - (hide annotations) (download)
Mon Apr 11 20:32:10 2016 UTC (8 years, 6 months ago) by vip-ire
Branch: MAIN
CVS Tags: e-smith-mysql-2_6_0-8_el7_sme, e-smith-mysql-2_6_0-10_el7_sme, e-smith-mysql-2_6_0-6_el7_sme, e-smith-mysql-2_6_0-7_el7_sme, e-smith-mysql-2_6_0-9_el7_sme 
* Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-6.sme
- Rename mysqld to mariadb [SME: 9438]
1 vip-ire 1.1 diff -Nur e-smith-mysql-2.6.0/createlinks e-smith-mysql-2.6.0_bz9438/createlinks
2     --- e-smith-mysql-2.6.0/createlinks 2016-02-05 23:29:32.000000000 +0100
3     +++ e-smith-mysql-2.6.0_bz9438/createlinks 2016-04-11 22:28:32.650623140 +0200
4     @@ -21,7 +21,7 @@
5     # When we do a restore, we want to start from a completely clean slate
6     $event = "pre-restore";
7    
8     -safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/mysqld");
9     +safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/mariadb");
10     # Needs to be after shutdown of mysqld
11     event_link("mysql-delete-db-files", $event, "99");
12    
13     @@ -33,7 +33,7 @@
14     foreach (qw(
15     /etc/my.cnf
16     /root/.my.cnf
17     - /var/service/mysqld/set.password
18     + /var/service/mariadb/set.password
19     ))
20     {
21     templates2events("$_", $event);
22     @@ -47,8 +47,12 @@
23     #--------------------------------------------------
24     $event = "timezone-update";
25    
26     -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysqld");
27     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb");
28    
29     templates2events("/etc/e-smith/sql/init/10mysql_upgrade",
30     "bootstrap-console-save");
31    
32     +safe_touch("root/var/service/mariadb/down");
33     +safe_symlink("/var/service/mariadb", "root/service/mariadb");
34     +safe_symlink("daemontools", "root/etc/rc.d/init.d/supervise/mariadb");
35     +service_link_enhanced("mariadb", 50, 7);
36     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/LocalNetworkingOnly e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/LocalNetworkingOnly
37     --- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/LocalNetworkingOnly 1970-01-01 01:00:00.000000000 +0100
38     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/LocalNetworkingOnly 2003-04-01 22:18:18.000000000 +0200
39     @@ -0,0 +1 @@
40     +yes
41     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/status e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/status
42     --- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/status 1970-01-01 01:00:00.000000000 +0100
43     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/status 2003-04-01 22:18:18.000000000 +0200
44     @@ -0,0 +1 @@
45     +enabled
46     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/type e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/type
47     --- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mariadb/type 1970-01-01 01:00:00.000000000 +0100
48     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mariadb/type 2003-04-01 22:18:18.000000000 +0200
49     @@ -0,0 +1 @@
50     +service
51     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/LocalNetworkingOnly e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/LocalNetworkingOnly
52     --- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/LocalNetworkingOnly 2003-04-01 22:18:18.000000000 +0200
53     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/LocalNetworkingOnly 1970-01-01 01:00:00.000000000 +0100
54     @@ -1 +0,0 @@
55     -yes
56     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/status e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/status
57     --- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/status 2003-04-01 22:18:18.000000000 +0200
58     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/status 1970-01-01 01:00:00.000000000 +0100
59     @@ -1 +0,0 @@
60     -enabled
61     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/type e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/type
62     --- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/defaults/mysqld/type 2003-04-01 22:18:18.000000000 +0200
63     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/defaults/mysqld/type 1970-01-01 01:00:00.000000000 +0100
64     @@ -1 +0,0 @@
65     -service
66     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/00mysqld2mariadb e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/migrate/00mysqld2mariadb
67     --- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/00mysqld2mariadb 1970-01-01 01:00:00.000000000 +0100
68     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/migrate/00mysqld2mariadb 2016-04-11 21:54:47.134272093 +0200
69     @@ -0,0 +1,11 @@
70     +{
71     + # Rename mysqld service entry to mariadb
72     +
73     + my $mysqld = $DB->get('mysqld') or return;
74     + my $mariadb = $DB->get('mariadb') ||
75     + $DB->new_record('mariadb', { type => 'service' });
76     +
77     + $mariadb->merge_props($mysqld->props);
78     + $mysqld->delete;
79     +
80     +}
81     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/15innodb e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/migrate/15innodb
82     --- e-smith-mysql-2.6.0/root/etc/e-smith/db/configuration/migrate/15innodb 2016-04-11 22:24:44.966702169 +0200
83     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/db/configuration/migrate/15innodb 2016-04-11 21:55:36.824255774 +0200
84     @@ -1,6 +1,6 @@
85     {
86     # InnoDB is mandatory with mariadb
87     - my $a = $DB->get("mysqld") or return;
88     - return unless (exists $mysqld{'InnoDB'});
89     - $DB->get_prop_and_delete('mysqld', 'InnoDB');
90     + my $a = $DB->get("mariadb") or return;
91     + return unless (exists $mariadb{'InnoDB'});
92     + $DB->get_prop_and_delete('mariadb', 'InnoDB');
93     }
94     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs
95     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs 2016-04-11 22:24:44.967702168 +0200
96     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs 2016-04-11 21:58:24.737201676 +0200
97     @@ -1,7 +1,7 @@
98     #! /bin/sh
99    
100     ( cat /home/e-smith/db/mysql/mysql.dump ;
101     - cat /service/mysqld/set.password ) | mysql || exit 1
102     + cat /service/mariadb/set.password ) | mysql || exit 1
103     /usr/bin/mysql_upgrade
104     P=$(cat /var/run/mariadb/mariadb.pid)
105     /bin/rm /var/run/mariadb/mariadb.pid
106     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/00mysqld.log e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/00mysqld.log
107     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/00mysqld.log 1970-01-01 01:00:00.000000000 +0100
108     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/00mysqld.log 2016-04-11 22:00:43.880158046 +0200
109     @@ -0,0 +1 @@
110     +/var/log/mariadb/mariadb.log
111     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/01mysqld.slow_queries e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/01mysqld.slow_queries
112     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/01mysqld.slow_queries 1970-01-01 01:00:00.000000000 +0100
113     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/01mysqld.slow_queries 2016-04-11 22:01:16.948147831 +0200
114     @@ -0,0 +1 @@
115     +/var/log/mariadb/slow_queries.log
116     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/10startOptions e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/10startOptions
117     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/10startOptions 1970-01-01 01:00:00.000000000 +0100
118     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/10startOptions 2003-12-22 17:45:45.000000000 +0100
119     @@ -0,0 +1 @@
120     +\{
121     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/50options e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/50options
122     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/50options 1970-01-01 01:00:00.000000000 +0100
123     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/50options 2016-04-11 22:12:41.060949016 +0200
124     @@ -0,0 +1,13 @@
125     + create 600 mysql mysql
126     + notifempty
127     + daily
128     + rotate 3
129     + missingok
130     + nocompress
131     + sharedscripts
132     + postrotate
133     + # just if mysqld is really running
134     + if test -n "`ps acx|grep mysqld`"; then
135     + /usr/bin/mysqladmin flush-logs
136     + fi
137     + endscript
138     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/99endOptions e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/99endOptions
139     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mariadb/99endOptions 1970-01-01 01:00:00.000000000 +0100
140     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mariadb/99endOptions 2003-12-22 17:45:45.000000000 +0100
141     @@ -0,0 +1 @@
142     +\}
143     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/00mysqld.log e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/00mysqld.log
144     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/00mysqld.log 2003-12-22 17:45:45.000000000 +0100
145     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/00mysqld.log 1970-01-01 01:00:00.000000000 +0100
146     @@ -1 +0,0 @@
147     -/var/log/mysqld.log
148     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/01mysqld.slow_queries e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/01mysqld.slow_queries
149     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/01mysqld.slow_queries 2003-12-22 17:45:45.000000000 +0100
150     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/01mysqld.slow_queries 1970-01-01 01:00:00.000000000 +0100
151     @@ -1 +0,0 @@
152     -/var/log/mysqld.slow_queries
153     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/10startOptions e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/10startOptions
154     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/10startOptions 2003-12-22 17:45:45.000000000 +0100
155     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/10startOptions 1970-01-01 01:00:00.000000000 +0100
156     @@ -1 +0,0 @@
157     -\{
158     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/50options e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/50options
159     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/50options 2003-12-22 17:45:45.000000000 +0100
160     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/50options 1970-01-01 01:00:00.000000000 +0100
161     @@ -1,13 +0,0 @@
162     - create 600 mysql mysql
163     - notifempty
164     - daily
165     - rotate 3
166     - missingok
167     - nocompress
168     - sharedscripts
169     - postrotate
170     - # just if mysqld is really running
171     - if test -n "`ps acx|grep mysqld`"; then
172     - /usr/bin/mysqladmin flush-logs
173     - fi
174     - endscript
175     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/99endOptions e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/99endOptions
176     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/etc/logrotate.d/mysqld/99endOptions 2003-12-22 17:45:45.000000000 +0100
177     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/etc/logrotate.d/mysqld/99endOptions 1970-01-01 01:00:00.000000000 +0100
178     @@ -1 +0,0 @@
179     -\}
180     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/var/service/mariadb/set.password e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/var/service/mariadb/set.password
181     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/var/service/mariadb/set.password 1970-01-01 01:00:00.000000000 +0100
182     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/var/service/mariadb/set.password 2008-10-06 16:29:16.000000000 +0200
183     @@ -0,0 +1,11 @@
184     +{
185     + use esmith::util;
186     +
187     + my $pw = esmith::util::LdapPassword();
188     +
189     + $OUT .= "use mysql;\n";
190     + $OUT .= "ALTER TABLE user MODIFY Password char(41) NOT NULL default '';\n";
191     + $OUT .= "UPDATE user SET password=password('$pw') WHERE user='root';\n";
192     + $OUT .= "DELETE FROM user WHERE user='';\n";
193     + $OUT .= "FLUSH PRIVILEGES;\n";
194     +}
195     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates/var/service/mysqld/set.password e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/var/service/mysqld/set.password
196     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates/var/service/mysqld/set.password 2008-10-06 16:29:16.000000000 +0200
197     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates/var/service/mysqld/set.password 1970-01-01 01:00:00.000000000 +0100
198     @@ -1,11 +0,0 @@
199     -{
200     - use esmith::util;
201     -
202     - my $pw = esmith::util::LdapPassword();
203     -
204     - $OUT .= "use mysql;\n";
205     - $OUT .= "ALTER TABLE user MODIFY Password char(41) NOT NULL default '';\n";
206     - $OUT .= "UPDATE user SET password=password('$pw') WHERE user='root';\n";
207     - $OUT .= "DELETE FROM user WHERE user='';\n";
208     - $OUT .= "FLUSH PRIVILEGES;\n";
209     -}
210     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates.metadata/var/service/mariadb/set.password e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates.metadata/var/service/mariadb/set.password
211     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates.metadata/var/service/mariadb/set.password 1970-01-01 01:00:00.000000000 +0100
212     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates.metadata/var/service/mariadb/set.password 2006-03-16 07:44:28.000000000 +0100
213     @@ -0,0 +1 @@
214     +PERMS=0400
215     diff -Nur e-smith-mysql-2.6.0/root/etc/e-smith/templates.metadata/var/service/mysqld/set.password e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates.metadata/var/service/mysqld/set.password
216     --- e-smith-mysql-2.6.0/root/etc/e-smith/templates.metadata/var/service/mysqld/set.password 2006-03-16 07:44:28.000000000 +0100
217     +++ e-smith-mysql-2.6.0_bz9438/root/etc/e-smith/templates.metadata/var/service/mysqld/set.password 1970-01-01 01:00:00.000000000 +0100
218     @@ -1 +0,0 @@
219     -PERMS=0400
220     diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/control/d e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/d
221     --- e-smith-mysql-2.6.0/root/var/service/mariadb/control/d 1970-01-01 01:00:00.000000000 +0100
222     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/d 2016-04-11 21:49:09.380386989 +0200
223     @@ -0,0 +1,3 @@
224     +#! /bin/sh
225     +
226     +exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
227     diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/control/i e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/i
228     --- e-smith-mysql-2.6.0/root/var/service/mariadb/control/i 1970-01-01 01:00:00.000000000 +0100
229     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/i 2016-04-11 21:49:09.380386989 +0200
230     @@ -0,0 +1,3 @@
231     +#! /bin/sh
232     +
233     +exec kill -INT $(cat /var/run/mariadb/mariadb.pid)
234     diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/control/q e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/q
235     --- e-smith-mysql-2.6.0/root/var/service/mariadb/control/q 1970-01-01 01:00:00.000000000 +0100
236     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/q 2016-04-11 21:49:09.380386989 +0200
237     @@ -0,0 +1,3 @@
238     +#! /bin/sh
239     +
240     +exec kill -QUIT $(cat /var/run/mariadb/mariadb.pid)
241     diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/control/t e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/t
242     --- e-smith-mysql-2.6.0/root/var/service/mariadb/control/t 1970-01-01 01:00:00.000000000 +0100
243     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/control/t 2016-04-11 21:49:09.380386989 +0200
244     @@ -0,0 +1,3 @@
245     +#! /bin/sh
246     +
247     +exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
248     diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/log/run e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/log/run
249     --- e-smith-mysql-2.6.0/root/var/service/mariadb/log/run 1970-01-01 01:00:00.000000000 +0100
250     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/log/run 2016-04-11 22:09:37.785000042 +0200
251     @@ -0,0 +1,26 @@
252     +#!/bin/sh
253     +
254     + #----------------------------------------------------------------------
255     + # copyright (C) 2003 Mitel Networks Corporation
256     + #
257     + # This program is free software; you can redistribute it and/or modify
258     + # it under the terms of the GNU General Public License as published by
259     + # the Free Software Foundation; either version 2 of the License, or
260     + # (at your option) any later version.
261     + #
262     + # This program is distributed in the hope that it will be useful,
263     + # but WITHOUT ANY WARRANTY; without even the implied warranty of
264     + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
265     + # GNU General Public License for more details.
266     + #
267     + # You should have received a copy of the GNU General Public License
268     + # along with this program; if not, write to the Free Software
269     + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
270     + #
271     + # Technical support for this program is available from Mitel Networks
272     + # Please visit our web site www.mitel.com/sme/ for details.
273     + #----------------------------------------------------------------------
274     + exec \
275     + /usr/local/bin/setuidgid smelog \
276     + /usr/local/bin/multilog t s5000000 \
277     + /var/log/mariadb.run
278     diff -Nur e-smith-mysql-2.6.0/root/var/service/mariadb/run e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/run
279     --- e-smith-mysql-2.6.0/root/var/service/mariadb/run 1970-01-01 01:00:00.000000000 +0100
280     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mariadb/run 2016-04-11 21:49:09.381386988 +0200
281     @@ -0,0 +1,19 @@
282     +#! /bin/sh
283     +
284     +exec 2>&1
285     +if [ ! -f /var/lib/mysql/mysql/user.frm ]
286     +then
287     + setuidgid mysql sh /usr/bin/mysql_install_db
288     + /usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables < ./set.password
289     + if [ -f /home/e-smith/db/mysql/mysql.dump ]
290     + then
291     + /sbin/e-smith/expand-template /etc/e-smith/sql/init/00_restore_dumped_dbs
292     + fi
293     +fi
294     +
295     +exec /usr/libexec/mysqld \
296     + --defaults-file=/etc/my.cnf \
297     + --basedir=/usr \
298     + --datadir=/var/lib/mysql \
299     + --user=mysql \
300     + --pid-file=/var/run/mariadb/mariadb.pid
301     diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/control/d e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/d
302     --- e-smith-mysql-2.6.0/root/var/service/mysqld/control/d 2016-04-11 22:24:44.968702168 +0200
303     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/d 1970-01-01 01:00:00.000000000 +0100
304     @@ -1,3 +0,0 @@
305     -#! /bin/sh
306     -
307     -exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
308     diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/control/i e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/i
309     --- e-smith-mysql-2.6.0/root/var/service/mysqld/control/i 2016-04-11 22:24:44.968702168 +0200
310     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/i 1970-01-01 01:00:00.000000000 +0100
311     @@ -1,3 +0,0 @@
312     -#! /bin/sh
313     -
314     -exec kill -INT $(cat /var/run/mariadb/mariadb.pid)
315     diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/control/q e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/q
316     --- e-smith-mysql-2.6.0/root/var/service/mysqld/control/q 2016-04-11 22:24:44.968702168 +0200
317     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/q 1970-01-01 01:00:00.000000000 +0100
318     @@ -1,3 +0,0 @@
319     -#! /bin/sh
320     -
321     -exec kill -QUIT $(cat /var/run/mariadb/mariadb.pid)
322     diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/control/t e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/t
323     --- e-smith-mysql-2.6.0/root/var/service/mysqld/control/t 2016-04-11 22:24:44.969702168 +0200
324     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/control/t 1970-01-01 01:00:00.000000000 +0100
325     @@ -1,3 +0,0 @@
326     -#! /bin/sh
327     -
328     -exec kill -TERM $(cat /var/run/mariadb/mariadb.pid)
329     diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/log/run e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/log/run
330     --- e-smith-mysql-2.6.0/root/var/service/mysqld/log/run 2004-12-20 22:03:36.000000000 +0100
331     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/log/run 1970-01-01 01:00:00.000000000 +0100
332     @@ -1,26 +0,0 @@
333     -#!/bin/sh
334     -
335     - #----------------------------------------------------------------------
336     - # copyright (C) 2003 Mitel Networks Corporation
337     - #
338     - # This program is free software; you can redistribute it and/or modify
339     - # it under the terms of the GNU General Public License as published by
340     - # the Free Software Foundation; either version 2 of the License, or
341     - # (at your option) any later version.
342     - #
343     - # This program is distributed in the hope that it will be useful,
344     - # but WITHOUT ANY WARRANTY; without even the implied warranty of
345     - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
346     - # GNU General Public License for more details.
347     - #
348     - # You should have received a copy of the GNU General Public License
349     - # along with this program; if not, write to the Free Software
350     - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
351     - #
352     - # Technical support for this program is available from Mitel Networks
353     - # Please visit our web site www.mitel.com/sme/ for details.
354     - #----------------------------------------------------------------------
355     - exec \
356     - /usr/local/bin/setuidgid smelog \
357     - /usr/local/bin/multilog t s5000000 \
358     - /var/log/mysqld
359     diff -Nur e-smith-mysql-2.6.0/root/var/service/mysqld/run e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/run
360     --- e-smith-mysql-2.6.0/root/var/service/mysqld/run 2016-04-11 22:24:44.969702168 +0200
361     +++ e-smith-mysql-2.6.0_bz9438/root/var/service/mysqld/run 1970-01-01 01:00:00.000000000 +0100
362     @@ -1,19 +0,0 @@
363     -#! /bin/sh
364     -
365     -exec 2>&1
366     -if [ ! -f /var/lib/mysql/mysql/user.frm ]
367     -then
368     - setuidgid mysql sh /usr/bin/mysql_install_db
369     - /usr/libexec/mysqld --bootstrap --user=mysql --skip-grant-tables < ./set.password
370     - if [ -f /home/e-smith/db/mysql/mysql.dump ]
371     - then
372     - /sbin/e-smith/expand-template /etc/e-smith/sql/init/00_restore_dumped_dbs
373     - fi
374     -fi
375     -
376     -exec /usr/libexec/mysqld \
377     - --defaults-file=/etc/my.cnf \
378     - --basedir=/usr \
379     - --datadir=/var/lib/mysql \
380     - --user=mysql \
381     - --pid-file=/var/run/mariadb/mariadb.pid
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed