From 48e6918c94d3a2caa99feb4b1195b9d6e2739581 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@mariadb.org>
Date: Tue, 8 Aug 2023 14:01:36 +0100
Subject: [PATCH] Revert "update galera_new_cluster to use environment file"

This reverts commit b54e4bf00b191633c74baad143c552bfb478fff3.
---
 scripts/CMakeLists.txt           | 15 ---------------
 scripts/galera_new_cluster.sh    |  4 ++--
 support-files/mariadb.service.in |  3 ---
 3 files changed, 2 insertions(+), 20 deletions(-)
 mode change 100644 => 100755 scripts/galera_new_cluster.sh

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index e41c4fce68f..358045c17ab 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -190,9 +190,6 @@ ELSE()
   SET(localstatedir ${MYSQL_DATADIR})
 ENDIF()
 
-get_filename_component(MYSQL_UNIX_DIR ${MYSQL_UNIX_ADDR} DIRECTORY)
-SET(mysqlunixdir ${MYSQL_UNIX_DIR})
-
 SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin")
 SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin")
 SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
@@ -210,18 +207,6 @@ INSTALL_SCRIPT(
   DESTINATION ${INSTALL_SCRIPTDIR}
   COMPONENT Server
   )
-
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/galera_new_cluster.sh
-  ${CMAKE_CURRENT_BINARY_DIR}/galera_new_cluster ESCAPE_QUOTES @ONLY)
-  EXECUTE_PROCESS(
-  COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/galera_new_cluster
-  )
-
-INSTALL_SCRIPT(
- "${CMAKE_CURRENT_BINARY_DIR}/galera_new_cluster"
-  DESTINATION ${INSTALL_SCRIPTDIR}
-  COMPONENT Server
-  )
 ENDIF()
 
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
diff --git a/scripts/galera_new_cluster.sh b/scripts/galera_new_cluster.sh
old mode 100644
new mode 100755
index b6617378b90..ac9dcf42102
--- a/scripts/galera_new_cluster.sh
+++ b/scripts/galera_new_cluster.sh
@@ -21,11 +21,11 @@ EOF
     exit 0
 fi
 
-echo _WSREP_NEW_CLUSTER='--wsrep-new-cluster' > @mysqlunixdir@/"wsrep-new-cluster-${1:-mariadb}" && \
+systemctl set-environment _WSREP_NEW_CLUSTER='--wsrep-new-cluster' && \
     systemctl restart ${1:-mariadb}
 
 extcode=$?
 
-rm -f @mysqlunixdir@/"wsrep-new-cluster-${1:-mariadb}"
+systemctl set-environment _WSREP_NEW_CLUSTER=''
 
 exit $extcode
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index 19e2e16abeb..2f990df4a15 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -70,9 +70,6 @@ ProtectSystem=full
 # Prevent accessing /home, /root and /run/user
 ProtectHome=true
 
-# Use an environment file to pass variable _WSREP_NEW_CLUSTER
-EnvironmentFile=-@mysqlunixdir@/wsrep-new-cluster-%N
-
 # Use an environment file to pass variable _WSREP_START_POSITION
 EnvironmentFile=-@mysqlunixdir@/wsrep-start-position