summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2011-07-25 23:13:32 +0400
committerVlad Glagolev2011-07-25 23:13:32 +0400
commit2efacfb70cd8bc84dd843d153d2fec9eaf308129 (patch)
treeefc1415894ec489681ce2fcf7d7d1ed8687232f8
parent1b7863d623896558fbd34a6c0d47a62fcab12e02 (diff)
mariadb: fixed init config installation
-rw-r--r--database/mariadb/HISTORY4
-rwxr-xr-xdatabase/mariadb/INSTALL6
-rw-r--r--database/mariadb/init.d/mariadb.conf (renamed from database/mariadb/profile.d/mariadb)0
3 files changed, 8 insertions, 2 deletions
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 7838782239..fd4f540cfa 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-25 Vlad Glagolev <stealth@sourcemage.org>
+ * INSTALL: corrected config installation for init script
+ * init.d/mariadb.conf: moved from profile.d/mariadb
+
2011-06-17 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 5.2.7
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index 1ae97454ad..1bf093d486 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/profile.d/mariadb b/database/mariadb/init.d/mariadb.conf
index b591f15469..b591f15469 100644
--- a/database/mariadb/profile.d/mariadb
+++ b/database/mariadb/init.d/mariadb.conf