summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2020-08-24 10:58:13 +1000
committerDaniel Black <daniel@mariadb.org>2020-08-24 19:09:37 +1000
commitc58e184b14ccdf0b0eaeeeb7947e23b8b5fff7a7 (patch)
tree499fc59330d517cdb4006befb826ab6fd9bde43c
parent6f42cae0a1dd005608ac808e63fcf29ddb09c8c6 (diff)
downloadmariadb-git-c58e184b14ccdf0b0eaeeeb7947e23b8b5fff7a7.tar.gz
MDEV-18841: /var/run -> /run for apparmor/systemd service
Match 10.5 path changes in: * b2feb030014f5ff7d71cd55326a93cc709386407 * aaaf005ce61a543f1a1470b179ccb535698b36ef * bb8477778b72f047437b2a03a2bd38997e155f10
-rw-r--r--support-files/mariadb@.service.in2
-rw-r--r--support-files/policy/apparmor/usr.sbin.mysqld4
2 files changed, 3 insertions, 3 deletions
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index 79f347ec271..14749092103 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -100,7 +100,7 @@
# in configuration between instances.
#
# [Service]
-# Environment=MYSQLD_MULTI_INSTANCE="--socket=/var/run/mysqld/%I.sock \
+# Environment=MYSQLD_MULTI_INSTANCE="--socket=/run/mysqld/%I.sock \
# --datadir=/var/lib/mysqld-multi/%I \
# --skip-networking"
#
diff --git a/support-files/policy/apparmor/usr.sbin.mysqld b/support-files/policy/apparmor/usr.sbin.mysqld
index 18a9c357ff2..c60ecd28531 100644
--- a/support-files/policy/apparmor/usr.sbin.mysqld
+++ b/support-files/policy/apparmor/usr.sbin.mysqld
@@ -54,8 +54,8 @@
/var/log/mysql.log rw,
/var/log/mysql/ r,
/var/log/mysql/* rw,
- /var/run/mysqld/mysqld.pid w,
- /var/run/mysqld/mysqld.sock w,
+ /run/mysqld/mysqld.pid w,
+ /run/mysqld/mysqld.sock w,
profile /bin/dash flags=(complain) {