[SM-Commit] GIT changes to stable-0.58 grimoire by George Sherwood (fb9ef1620fddc1b305bd51c4d7c4346f87575fa0)

George Sherwood scm at sourcemage.org
Sat Jul 30 16:46:34 EDT 2011


GIT changes to stable-0.58 grimoire by George Sherwood <gsherwood at sourcemage.org>:

 database/mariadb/HISTORY             |    4 ++++
 database/mariadb/INSTALL             |    6 ++++--
 database/mariadb/init.d/mariadb.conf |    4 ++++
 database/mariadb/profile.d/mariadb   |    4 ----
 4 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit fb9ef1620fddc1b305bd51c4d7c4346f87575fa0
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    mariadb: fixed init config installation
    (cherry picked from commit 2efacfb70cd8bc84dd843d153d2fec9eaf308129)

diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 7838782..fd4f540 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-25 Vlad Glagolev <stealth at sourcemage.org>
+	* INSTALL: corrected config installation for init script
+	* init.d/mariadb.conf: moved from profile.d/mariadb
+
 2011-06-17 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 5.2.7
 
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index 1ae9745..1bf093d 100755
--- a/database/mariadb/INSTALL
+++ b/database/mariadb/INSTALL
@@ -11,5 +11,7 @@ if [[ $MARIA_BENCH == n ]]; then
     rm -fr "${INSTALL_ROOT}/usr/share/mysql/sql-bench"
 fi &&
 
-install -vm 0644 "$SPELL_DIRECTORY/profile.d/mariadb" \
-                 "$INSTALL_ROOT/etc/sysconfig"
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SPELL_DIRECTORY/init.d/mariadb.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/mariadb"
+fi
diff --git a/database/mariadb/init.d/mariadb.conf b/database/mariadb/init.d/mariadb.conf
new file mode 100644
index 0000000..b591f15
--- /dev/null
+++ b/database/mariadb/init.d/mariadb.conf
@@ -0,0 +1,4 @@
+# Mariadb Global Configuration
+# Set the Data directory here
+
+DATA_DIR=/var/lib/mariadb
diff --git a/database/mariadb/profile.d/mariadb b/database/mariadb/profile.d/mariadb
deleted file mode 100644
index b591f15..0000000
--- a/database/mariadb/profile.d/mariadb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Mariadb Global Configuration
-# Set the Data directory here
-
-DATA_DIR=/var/lib/mariadb


More information about the SM-Commit mailing list