From 56b77e4fe7591580fa9d8335d697652ae11601fe Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 30 Jul 2021 20:11:28 +0800 Subject: mariadb: redefine log-error item The log-error item which defined in my.cnf is "/var/log/mysqld.err" previouly and it's not consistent with which created in install_db service file which will call mysql-systemd-start to create the file "/var/log/mysqld.log". And it fails when boot with sysvinit as below: $ service mysqld start Starting MariaDB.210727 04:05:03 mysqld_safe Logging to '/var/log/mysqld.err'. 210727 04:05:03 mysqld_safe Starting mariadbd daemon with databases from /var/lib/mysql /usr/bin/mysqld_safe_helper: Can't create/write to file '/var/log/mysqld.err' (Errcode: 13 "Permission denied") So make the log-error item consistent to fix the above failure and also remove the related workaround when boot with systemd. Signed-off-by: Mingli Yu Signed-off-by: Khem Raj (cherry picked from commit 1a4144d954692ad68121d16adae09dc990e8ab1f) Signed-off-by: Armin Kuster --- meta-oe/recipes-dbs/mysql/mariadb.inc | 5 ----- meta-oe/recipes-dbs/mysql/mariadb/my.cnf | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 5787ae4bd7..7cf08f4719 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -168,11 +168,6 @@ do_install() { sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \ ${D}${systemd_unitdir}/system/install_db.service - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "f /var/log/mysqld.err 0640 mysql mysql -" \ - > ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf - fi install -d ${D}${bindir} install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir} install -d ${D}${datadir}/doc/${PN} diff --git a/meta-oe/recipes-dbs/mysql/mariadb/my.cnf b/meta-oe/recipes-dbs/mysql/mariadb/my.cnf index dc4c172e54..75db46a559 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/my.cnf +++ b/meta-oe/recipes-dbs/mysql/mariadb/my.cnf @@ -10,7 +10,7 @@ user = mysql port = 3306 socket = /var/lib/mysql/mysql.sock pid-file = /var/lib/mysql/mysqld.pid -log-error = /var/log/mysqld.err +log-error = /var/log/mysqld.log basedir = /usr datadir = /var/lib/mysql skip-external-locking -- cgit v1.2.3-54-g00ecf