diff options
| -rw-r--r-- | cmake/systemd.cmake | 2 | ||||
| -rw-r--r-- | support-files/mariadb.service.in | 4 | ||||
| -rw-r--r-- | support-files/mariadb@.service.in | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake index f031f4be0f4..30374e4c348 100644 --- a/cmake/systemd.cmake +++ b/cmake/systemd.cmake @@ -61,7 +61,7 @@ MACRO(CHECK_SYSTEMD) ${INSTALL_SYSTEMD_UNITDIR}/mariadb@.service ${INSTALL_SYSTEMD_UNITDIR}/mariadb@bootstrap.service.d/wsrep-new-cluster.conf") IF(DEB) - SET(SYSTEMD_EXECSTARTPRE "PermissionsStartOnly=true\nExecStartPre=/usr/bin/install -m 755 -o mysql -g root -d /var/run/mysqld") + SET(SYSTEMD_EXECSTARTPRE "ExecStartPre=/usr/bin/install -m 755 -o mysql -g root -d /var/run/mysqld") SET(SYSTEMD_EXECSTARTPOST "ExecStartPost=/etc/mysql/debian-start") ENDIF() MESSAGE(STATUS "Systemd features enabled") diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in index a40b3e18e27..0b4e8f6befe 100644 --- a/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in @@ -43,10 +43,10 @@ User=mysql Group=mysql # Execute pre and post scripts as root, otherwise it does it as User= -# PermissionsStartOnly=true +PermissionsStartOnly=true # Needed to create system tables etc. -# ExecStartPre=/usr/bin/mysql_install_db +# ExecStartPre=/usr/bin/mysql_install_db -u mysql # Start main service # MYSQLD_OPTS here is for users to set in /etc/systemd/system/mariadb.service.d/MY_SPECIAL.conf diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index b8ef969cf32..dd9eded610f 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -50,10 +50,10 @@ User=mysql Group=mysql # Execute pre and post scripts as root, otherwise it does it as User= -# PermissionsStartOnly=true +PermissionsStartOnly=true # Needed to create system tables etc. -# ExecStartPre=/usr/bin/mysql_install_db +# ExecStartPre=/usr/bin/mysql_install_db -u mysql # Start main service # MYSQLD_OPTS here is for users to set in /etc/systemd/system/mariadb@.service.d/MY_SPECIAL.conf |