diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:14:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:14:33 +0300 |
| commit | d3350c160a7a884e97a5e4a696432230c13d53e0 (patch) | |
| tree | f7f5c35737b4c87dcfac73f7547d0d2321276be9 /support-files/mariadb.service.in | |
| parent | a39c4b5f9f7f4d2766f1ddb9487de27259e804a1 (diff) | |
| parent | b6bb64e54a3e34a20cda34e25b6ec62a097955ef (diff) | |
| download | mariadb-git-d3350c160a7a884e97a5e4a696432230c13d53e0.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'support-files/mariadb.service.in')
| -rw-r--r-- | support-files/mariadb.service.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in index b1371fafa71..8d2e57b8290 100644 --- a/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in @@ -91,9 +91,7 @@ ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \ # Use the [Service] section and Environment="MYSQLD_OPTS=...". # This isn't a replacement for my.cnf. # _WSREP_NEW_CLUSTER is for the exclusive use of the script galera_new_cluster -# Note: we set --basedir to prevent probes that might trigger SELinux alarms, -# per bug https://bugzilla.redhat.com/show_bug.cgi?id=547485 -ExecStart=@sbindir@/mysqld $MYSQLD_OPTS --basedir=@prefix@ $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION +ExecStart=@sbindir@/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION # Unset _WSREP_START_POSITION environment variable. ExecStartPost=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION" |