From d8a96173127f607ee4e5b57c7feeeac6c18bc8c6 Mon Sep 17 00:00:00 2001
From: Leonid Fedorov <leonid.fedorov@mariadb.com>
Date: Thu, 22 May 2025 16:20:18 +0000
Subject: [PATCH] set only one config dir, as LAYOUT_STANDALONE works with the
 same one, forcing color inside bootstrap

---
 .drone.jsonnet         |  1 -
 build/bootstrap_mcs.sh | 10 +++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index a60e81885..59cd6dfd6 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -737,7 +737,6 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
                //SCCACHE_LOG: 'debug',
              },
              commands: [
-                         "export CLICOLOR_FORCE=1",
                          "mkdir /mdb/" + builddir + "/" + result,
                          get_sccache,
                        ]
diff --git a/build/bootstrap_mcs.sh b/build/bootstrap_mcs.sh
index 8bb8ea9de..cea898ee0 100755
--- a/build/bootstrap_mcs.sh
+++ b/build/bootstrap_mcs.sh
@@ -6,13 +6,13 @@
 
 set -o pipefail
 
+export CLICOLOR_FORCE=1 #cmake output
+
 INSTALL_PREFIX="/usr/"
 DATA_DIR="/var/lib/mysql/data"
 CMAKE_BIN_NAME=cmake
 CTEST_BIN_NAME=ctest
-RPM_CONFIG_DIR="/etc/my.cnf.d"
-DEB_CONFIG_DIR="/etc/mysql/mariadb.conf.d"
-CONFIG_DIR=$RPM_CONFIG_DIR
+CONFIG_DIR="/etc/my.cnf.d"
 
 SCRIPT_LOCATION=$(dirname "$0")
 MDB_SOURCE_PATH=$(realpath "$SCRIPT_LOCATION"/../../../..)
@@ -84,10 +84,6 @@ if [[ "$OS" == *"rocky"* ]]; then
     pkg_format="rpm"
 fi
 
-if [[ $pkg_format = "deb" ]]; then
-    CONFIG_DIR=$DEB_CONFIG_DIR
-fi
-
 disable_git_restore_frozen_revision() {
     cd $MDB_SOURCE_PATH
     git config submodule.storage/columnstore/columnstore.update none