summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2020-09-24 08:00:41 +1000
committerDaniel Black <daniel@mariadb.org>2020-09-24 08:00:41 +1000
commit88c5c319e541ac5b829cebce175728ea6bdd9b35 (patch)
tree599e174d63115852c40de6ef047f99d5ff52ab0b
parent053653a23cac6f3f2e5288979438de27c9d0100a (diff)
parent4c19227929b0d86616337585fb95a4bb8fe0d4b2 (diff)
downloadmariadb-git-88c5c319e541ac5b829cebce175728ea6bdd9b35.tar.gz
Merge branch '10.1' of https://github.com/MariaDB/server into 10.1
-rw-r--r--support-files/use_galera_new_cluster.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/support-files/use_galera_new_cluster.conf b/support-files/use_galera_new_cluster.conf
index 90e0365ffd8..79d191094d4 100644
--- a/support-files/use_galera_new_cluster.conf
+++ b/support-files/use_galera_new_cluster.conf
@@ -15,8 +15,13 @@ 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
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=