[ptxdist] [PATCH 10/20] mariadb: adapt package's '/var/lib' requirements

[Juergen Borleis <jbe@pengutronix.de>]

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
 projectroot/usr/lib/systemd/system/mariadb-init.service | 2 +-
 projectroot/usr/lib/systemd/system/mariadb.service      | 1 +
 rules/mariadb.in                                        | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/projectroot/usr/lib/systemd/system/mariadb-init.service b/projectroot/usr/lib/systemd/system/mariadb-init.service
index af18afa0a..71e37b658 100644
--- a/projectroot/usr/lib/systemd/system/mariadb-init.service
+++ b/projectroot/usr/lib/systemd/system/mariadb-init.service
@@ -21,7 +21,6 @@
 
 [Unit]
 Description=MariaDB Server Initialization Service
-RequiresMountsFor=/var/lib/mysql
 ConditionPathExists=!/var/lib/mysql/data
 
 [Service]
@@ -29,6 +28,7 @@ User=root
 Group=root
 Type=oneshot
 RemainAfterExit=yes
+StateDirectory=mysql
 
 ExecStart=/bin/chown -R mysql:mysql /var/lib/mysql
 ExecStart=/bin/chmod 0755 /var/lib/mysql
diff --git a/projectroot/usr/lib/systemd/system/mariadb.service b/projectroot/usr/lib/systemd/system/mariadb.service
index 120bfefe6..5d00d9119 100644
--- a/projectroot/usr/lib/systemd/system/mariadb.service
+++ b/projectroot/usr/lib/systemd/system/mariadb.service
@@ -7,6 +7,7 @@ After=mariadb-init.service
 User=mysql
 Group=mysql
 PrivateDevices=true
+StateDirectory=mysql
 
 ExecStart=/usr/bin/mysqld
 
diff --git a/rules/mariadb.in b/rules/mariadb.in
index b2127ea34..06cf4b9ad 100644
--- a/rules/mariadb.in
+++ b/rules/mariadb.in
@@ -16,10 +16,14 @@ config MARIADB
 	select NCURSES
 	select SYSTEMD		if MARIADB_SYSTEMD
 	select ZLIB
+	select ROOTFS_VAR_LIB	if RUNTIME
 	prompt "mariadb" if ALLYES
 	help
 	  MariaDB, a SQL database engine
 
+	  Note: on a read-only root filesystem this package still requires a
+	  writable '/var/lib' for the database.
+
 if MARIADB
 
 config MARIADB_SYSTEMD
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de