diff options
| author | Daniel Black <daniel@mariadb.org> | 2020-08-24 10:58:13 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2020-08-24 10:59:27 +1000 |
| commit | 0563a6953fc5fdc56d4da835a086e40ba553c9b6 (patch) | |
| tree | d0cd8d3cff084d10df4ced9b41431c30c9f25fae | |
| parent | ee61c8c0b762840ab5badaa9d6b3a24b1c2ee8c7 (diff) | |
| download | mariadb-git-bb-10.5-MDEV-18841-slash-run-support-files-danielblack.tar.gz | |
MDEV-18841: /var/run -> /run for apparmor/systemd servicebb-10.5-MDEV-18841-slash-run-support-files-danielblack
Match 10.5 path changes in:
* b2feb030014f5ff7d71cd55326a93cc709386407
* aaaf005ce61a543f1a1470b179ccb535698b36ef
* bb8477778b72f047437b2a03a2bd38997e155f10
| -rw-r--r-- | support-files/mariadb@.service.in | 2 | ||||
| -rw-r--r-- | support-files/policy/apparmor/usr.sbin.mysqld | 4 |
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) { |