1 |
brianr |
1.1 |
--- smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server.multiple_dbpatches 2009-02-04 13:46:43.000000000 +0100 |
2 |
|
|
+++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 2009-12-02 23:09:22.000000000 +0100 |
3 |
|
|
@@ -3,7 +3,6 @@ |
4 |
|
|
my $user = ${'zabbix-server'}{'DbUser'} || 'zabbix'; |
5 |
|
|
my $pass = ${'zabbix-server'}{'DbPassword'} || 'secret'; |
6 |
|
|
|
7 |
|
|
-my $dbpatch = `rpm -qd zabbix-server | grep dbpatch | grep mysql`; |
8 |
|
|
my $schema = `rpm -qd zabbix-server | grep schema | grep mysql`; |
9 |
|
|
my $data = `rpm -qd zabbix-server | grep data.sql`; |
10 |
|
|
my $images = `rpm -qd zabbix-server | grep images_mysql`; |
11 |
|
|
@@ -12,7 +11,9 @@ |
12 |
|
|
$OUT .= <<"END"; |
13 |
|
|
#! /bin/sh |
14 |
|
|
if [ -d /var/lib/mysql/$db ]; then |
15 |
|
|
- /usr/bin/mysql $db < $dbpatch |
16 |
|
|
+ for P in \$(rpm -qd zabbix-server | grep dbpatch | grep mysql); do |
17 |
|
|
+ /usr/bin/mysql $db < \$P |
18 |
|
|
+ done |
19 |
|
|
else |
20 |
|
|
/usr/bin/mysqladmin create $db |
21 |
|
|
/usr/bin/mysql $db < $schema |