mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
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 <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1a4144d954)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
@@ -168,11 +168,6 @@ do_install() {
|
|||||||
sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \
|
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
|
${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 -d ${D}${bindir}
|
||||||
install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir}
|
install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir}
|
||||||
install -d ${D}${datadir}/doc/${PN}
|
install -d ${D}${datadir}/doc/${PN}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ user = mysql
|
|||||||
port = 3306
|
port = 3306
|
||||||
socket = /var/lib/mysql/mysql.sock
|
socket = /var/lib/mysql/mysql.sock
|
||||||
pid-file = /var/lib/mysql/mysqld.pid
|
pid-file = /var/lib/mysql/mysqld.pid
|
||||||
log-error = /var/log/mysqld.err
|
log-error = /var/log/mysqld.log
|
||||||
basedir = /usr
|
basedir = /usr
|
||||||
datadir = /var/lib/mysql
|
datadir = /var/lib/mysql
|
||||||
skip-external-locking
|
skip-external-locking
|
||||||
|
|||||||
Reference in New Issue
Block a user