summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-09-22 15:21:43 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-09-22 15:21:43 +0300
commit9d0ee2dcb72c011b4ee73c578cc32b666297ca31 (patch)
tree87992f23022a4fdd0e722ced5388e0fe0ea1a5e9 /support-files
parent78efa1093076307946873f322b45a14d1ed5ffb0 (diff)
parent4c19227929b0d86616337585fb95a4bb8fe0d4b2 (diff)
downloadmariadb-git-9d0ee2dcb72c011b4ee73c578cc32b666297ca31.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'support-files')
-rw-r--r--support-files/use_galera_new_cluster.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/support-files/use_galera_new_cluster.conf b/support-files/use_galera_new_cluster.conf
index 4d8ad253ce5..79d191094d4 100644
--- a/support-files/use_galera_new_cluster.conf
+++ b/support-files/use_galera_new_cluster.conf
@@ -15,6 +15,7 @@ ConditionPathExists=
Type=oneshot
Restart=no
+# Don't install or try to prepare for galera SST.
ExecStartPre=
# Override the multi instance service for a bootstrap start instance
@@ -22,4 +23,5 @@ ExecStart=
ExecStart=/usr/bin/echo "Please use galera_new_cluster to start the mariadb service with --wsrep-new-cluster"
ExecStart=/usr/bin/false
+# This isn't a service meant to execute anything but a message
ExecStartPost=