diff --git a/packages/addons/service/mariadb/source/bin/mariadb.start b/packages/addons/service/mariadb/source/bin/mariadb.start index 365b034674..65e9e9fddd 100755 --- a/packages/addons/service/mariadb/source/bin/mariadb.start +++ b/packages/addons/service/mariadb/source/bin/mariadb.start @@ -7,7 +7,7 @@ oe_setup_addon service.mariadb # create dir for socket and pid -mkdir -p /var/run/mysqld +mkdir -p /run/mysqld # exit if already running PID=$(ps aux | awk '/\/bin\/mariadbd/ {print $1; exit 0}') diff --git a/packages/addons/service/mariadb/source/bin/mariadb.stop b/packages/addons/service/mariadb/source/bin/mariadb.stop index dc1082a1e9..5983cbf4bd 100755 --- a/packages/addons/service/mariadb/source/bin/mariadb.stop +++ b/packages/addons/service/mariadb/source/bin/mariadb.stop @@ -3,4 +3,4 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) -kill $(cat /var/run/mysqld/mysqld.pid) +kill $(cat /run/mysqld/mysqld.pid) diff --git a/packages/addons/service/mariadb/source/config/my.cnf b/packages/addons/service/mariadb/source/config/my.cnf index 44fbc9edda..a11eee28af 100644 --- a/packages/addons/service/mariadb/source/config/my.cnf +++ b/packages/addons/service/mariadb/source/config/my.cnf @@ -17,14 +17,14 @@ # Remember to edit /etc/mysql/debian.cnf when changing the socket location. [client] port = 3306 -socket = /var/run/mysqld/mysqld.sock +socket = /run/mysqld/mysqld.sock # Here is entries for some specific programs # The following values assume you have at least 32M ram # This was formally known as [safe_mysqld]. Both versions are currently parsed. [mysqld_safe] -socket = /var/run/mysqld/mysqld.sock +socket = /run/mysqld/mysqld.sock nice = 0 [mysqld] @@ -32,8 +32,8 @@ nice = 0 # * Basic Settings # user = root -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock +pid-file = /run/mysqld/mysqld.pid +socket = /run/mysqld/mysqld.sock port = 3306 basedir = /storage/.kodi/addons/service.mariadb datadir = /storage/.kodi/userdata/addon_data/service.mariadb/data diff --git a/packages/addons/service/mariadb/source/system.d/service.mariadb.service b/packages/addons/service/mariadb/source/system.d/service.mariadb.service index d32054a973..1005516c15 100644 --- a/packages/addons/service/mariadb/source/system.d/service.mariadb.service +++ b/packages/addons/service/mariadb/source/system.d/service.mariadb.service @@ -5,7 +5,7 @@ Before=kodi.service [Service] Type=forking -PIDFile=/var/run/mysqld/mysqld.pid +PIDFile=/run/mysqld/mysqld.pid ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.mariadb/bin/mariadb.start" ExecStop=/bin/sh -c "exec sh /storage/.kodi/addons/service.mariadb/bin/mariadb.stop" TimeoutStartSec=60