diff options
| -rw-r--r-- | utils/mariadb/Makefile | 2 | ||||
| -rw-r--r-- | utils/mariadb/files/mysqld.init | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 9fba4e454..9fdf85972 100644 --- 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 98c8c65c4..fcd08d61e 100644 --- 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" ] || { |