diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/createlinks mezzanine_patched_smeserver-freepbx-0.1/createlinks
--- smeserver-freepbx-0.1/createlinks	2010-09-21 13:27:41.000000000 +0200
+++ mezzanine_patched_smeserver-freepbx-0.1/createlinks	2010-09-21 13:24:42.000000000 +0200
@@ -36,7 +36,7 @@
 templates2events("/etc/asterisk/manager.conf", qw(freepbx-update bootstrap-console-save));
 templates2events("/etc/httpd/conf/httpd.conf", $event);
 templates2events("/etc/httpd/fpbx-conf/httpd.conf", qw(freepbx-update bootstrap-console-save conf-userpanel));
-templates2events("/etc/e-smith/sql/init/freepbx.sql", qw(freepbx-update bootstrap-console-save));
+templates2events("/etc/e-smith/sql/init/30freepbx_mysql_create_database", qw(freepbx-update bootstrap-console-save));
 
 event_link("freepbx-clean-crontab", $event, "40");
 event_link("freepbx-dump-astdb", "pre-backup", "30");
diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database
--- smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database	2010-09-21 13:26:25.000000000 +0200
@@ -0,0 +1,83 @@
+{
+
+my $dbname = $freepbx{'DbName'} || 'freepbxdb';
+my $cdrdbname = $freepbx{'CdrDbName'} || 'asteriskcdrdb';
+my $dbuser = $freepbx{'DbUser'} || 'freepbxuser';
+my $dbpass = $freepbx{'DbPassword'} || 'secret';
+my $cdrdbpass = $freepbx{'CdrDbPassword'} || 'secret';
+
+$OUT .= << "HERE";
+#! /bin/sh
+
+if [ ! -d /var/lib/mysql/$dbname ]; then
+    mysqladmin create $dbname
+
+    if [ -e /usr/lib/freepbx/SQL/newinstall.sql ]; then
+        mysql $dbname < /usr/lib/freepbx/SQL/newinstall.sql
+    else
+        echo "Error: file /usr/lib/freepbx/SQL/newinstall.sql dosen't exists"
+        exit 1
+    fi
+fi
+
+if [ ! -d /var/lib/mysql/$cdrdbname ]; then
+    mysqladmin create $cdrdbname
+    if [ -e /usr/lib/freepbx/SQL/cdr_mysql_table.sql ]; then
+        mysql $cdrdbname < /usr/lib/freepbx/SQL/cdr_mysql_table.sql
+    else
+        echo "Error: file /usr/lib/freepbx/SQL/cdr_mysql_table.sql dosen't exists"
+        exit 1
+    fi
+fi
+
+/usr/bin/mysql <<EOF
+USE mysql;
+
+REPLACE INTO user (  
+                     host,
+                     user,
+                     password)
+            VALUES ( 
+                     'localhost',
+                     '$dbuser',
+                     PASSWORD ('$dbpass'));
+
+
+REPLACE INTO db (  
+                   host,
+                   db,
+                   user,
+                   select_priv, insert_priv, update_priv, delete_priv,
+                   create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,
+                   grant_priv, lock_tables_priv, references_priv)
+          VALUES ( 
+                   'localhost',
+                   '$dbname',
+                   '$dbuser',
+                   'Y', 'Y', 'Y', 'Y',
+                   'Y', 'Y', 'Y', 'Y', 'Y',
+                   'N', 'Y', 'Y');
+REPLACE INTO db (  
+                   host,
+                   db,
+                   user,
+                   select_priv, insert_priv, update_priv, delete_priv,
+                   create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,
+                   grant_priv, lock_tables_priv, references_priv)
+          VALUES (
+                   'localhost',
+                   '$cdrdbname',
+                   '$dbuser',
+                   'Y', 'Y', 'Y', 'Y',
+                   'Y', 'Y', 'Y', 'Y', 'Y',
+                   'N', 'Y', 'Y');
+
+
+FLUSH PRIVILEGES;
+
+EOF
+
+
+HERE
+}
+
diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/freepbx.sql mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/freepbx.sql
--- smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/freepbx.sql	2008-09-22 19:09:21.000000000 +0200
+++ mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/freepbx.sql	1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-# GLPI MySQL init template
-#
-# This files creates/updates FreePBX's MySQL database infos
-
-
-USE mysql;
-
-CREATE DATABASE IF NOT EXISTS { $freepbx{DbName} };
-CREATE DATABASE IF NOT EXISTS { $freepbx{CdrDbName} };
-
-REPLACE INTO user (
-                     host,
-                     user,
-                     password)
-            VALUES (
-                     'localhost',
-                     '{ $freepbx{DbUser} }',
-                     PASSWORD ('{ $freepbx{DbPassword} }'));
-
-REPLACE INTO db (
-                   host,
-                   db,
-                   user,
-                   select_priv, insert_priv, update_priv, delete_priv,
-                   create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,
-                   grant_priv, lock_tables_priv, references_priv) 
-          VALUES (
-                   'localhost',
-                   '{ $freepbx{DbName} }',
-                   '{ $freepbx{DbUser} }',
-                   'Y', 'Y', 'Y', 'Y',
-                   'Y', 'Y', 'Y', 'Y', 'N',
-                   'N', 'N', 'N');
-
-REPLACE INTO db (
-                   host,
-                   db,
-                   user,
-                   select_priv, insert_priv, update_priv, delete_priv,
-                   create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,
-                   grant_priv, lock_tables_priv, references_priv) 
-          VALUES (
-                   'localhost',
-                   '{ $freepbx{CdrDbName} }',
-                   '{ $freepbx{DbUser} }',
-                   'Y', 'Y', 'Y', 'Y',
-                   'Y', 'Y', 'Y', 'Y', 'N',
-                   'N', 'N', 'N');
-
-FLUSH PRIVILEGES;
-
diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30freepbx_mysql_create_database mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30freepbx_mysql_create_database
--- smeserver-freepbx-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30freepbx_mysql_create_database	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/30freepbx_mysql_create_database	2010-09-21 13:27:31.000000000 +0200
@@ -0,0 +1 @@
+PERMS=0540