[oe-commits] Roy Li : mariadb: make it be able to work with SELinux

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 9bb362cb3fdf3c28c6bb1f510fd303b5297c218f
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=9bb362cb3fdf3c28c6bb1f510fd303b5297c218f

Author: Roy Li <rongqing.li at windriver.com>
Date:   Fri Feb  6 13:59:46 2015 +0800

mariadb: make it be able to work with SELinux

1. change the datadir from /var/mysql to /var/lib/mysql
2. after creating datedir, restorecon on it, make SELinux be able to
work
3. Add the PIDFile for systemd unit file, otherwise systemctl can not
stop mysqld

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/mysql/mariadb.inc            | 1 +
 meta-oe/recipes-support/mysql/mariadb/my.cnf         | 2 +-
 meta-oe/recipes-support/mysql/mariadb/mysqld.service | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index 8068862..f385bfc 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -128,6 +128,7 @@ pkg_postinst_${PN}-server () {
 
     mysql_install_db --basedir=${prefix} --user=mysql
 
+    [ -x /sbin/restorecon ] && /sbin/restorecon -RF /var/lib/mysql
 }
 
 PACKAGES = "${PN}-dbg ${PN} \
diff --git a/meta-oe/recipes-support/mysql/mariadb/my.cnf b/meta-oe/recipes-support/mysql/mariadb/my.cnf
index 876ce36..28d3899 100644
--- a/meta-oe/recipes-support/mysql/mariadb/my.cnf
+++ b/meta-oe/recipes-support/mysql/mariadb/my.cnf
@@ -13,7 +13,7 @@ socket 						= /var/lib/mysql/mysql.sock
 pid-file 					= /var/lib/mysql/mysqld.pid
 log-error 					= /var/log/mysqld.err
 basedir 					= /usr
-datadir 					= /var/mysql
+datadir 					= /var/lib/mysql
 skip-external-locking
 skip-networking
 ignore-builtin-innodb
diff --git a/meta-oe/recipes-support/mysql/mariadb/mysqld.service b/meta-oe/recipes-support/mysql/mariadb/mysqld.service
index 18ad8d5..757d038 100644
--- a/meta-oe/recipes-support/mysql/mariadb/mysqld.service
+++ b/meta-oe/recipes-support/mysql/mariadb/mysqld.service
@@ -4,6 +4,7 @@ After=syslog.target
 After=network.target
 
 [Service]
+PIDFile=/var/lib/mysql/mysqld.pid
 Type=simple
 User=mysql
 Group=mysql