mariadb: fix /etc/mysql setup

- create directory /etc/mysql/conf.d as without it the server refuses to
  start
- correct the path to my.cnf in the init script

Signed-off-by: Sebastian Kemper <redacted>

diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile
index 9fba4e4541d8ad85a3825d9c47b6d867f04c158c..9fdf859722bc8c761b38e93dd6f64c6dc2735f2c 100644 (file)
--- a/utils/mariadb/Makefile
+++ b/utils/mariadb/Makefile
@@ -453,7 +453,7 @@ define Package/mariadb-server/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(foreach b,$(MARIADB_SERVER),$(call Package/mariadb/install/bin,$(1),$(b));)
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_DIR) $(1)/etc/mysql
+       $(INSTALL_DIR) $(1)/etc/mysql/conf.d
        $(INSTALL_BIN) files/mysqld.init $(1)/etc/init.d/mysqld
        $(INSTALL_CONF) conf/my.cnf $(1)/etc/mysql
        $(INSTALL_DIR) $(1)$(PLUGIN_DIR)

diff --git a/utils/mariadb/files/mysqld.init b/utils/mariadb/files/mysqld.init
index 98c8c65c4058217816fb575923733ae3d93fb322..fcd08d61edea6c7dc7560214e43c6a491cb36001 100644 (file)
--- a/utils/mariadb/files/mysqld.init
+++ b/utils/mariadb/files/mysqld.init
@@ -10,7 +10,7 @@ SERVICE_STOP_TIME=9
 PROG='/usr/bin/mysqld'
 
 start() {
-       local conf='/etc/my.cnf'
+       local conf='/etc/mysql/my.cnf'
        local datadir="$( sed -nE "s/^\s*datadir\s*=\s*('([^']*)'|\x22([^\x22]*)\x22|(.*\S))\s*$/\2\3\4/p" "$conf" )"
 
        [ -d "$datadir" ] || {