From 5d9e5c08a401d61ed28226be07040b9eefb43c22 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Fri, 16 Aug 2024 14:12:38 +0200 Subject: [PATCH] common/config: export CEPH_CONF_FILE_DEFAULT It used to be exported until commit 318c62f8ae16 ("common/config: cleanup remove some unused macros"). Having CEPH_CONF_FILE_DEFAULT avaialable is handy to prevent parse_config_files() from picking up CEPH_CONF environment variable. Signed-off-by: Ilya Dryomov (cherry picked from commit 57a8c535ccad35a9f6e11e8976bc32f390ad341c) --- src/common/config.cc | 2 +- src/common/config.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/config.cc b/src/common/config.cc index 604b3c35d5e32..e151e94bb90fd 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -55,7 +55,7 @@ using ceph::decode; using ceph::encode; using ceph::Formatter; -static const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config,/etc/ceph/$cluster.conf,$home/.ceph/$cluster.conf,$cluster.conf" +const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config,/etc/ceph/$cluster.conf,$home/.ceph/$cluster.conf,$cluster.conf" #if defined(__FreeBSD__) ",/usr/local/etc/ceph/$cluster.conf" #elif defined(_WIN32) diff --git a/src/common/config.h b/src/common/config.h index ff7bc20f613df..3e7b51d987d25 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -39,6 +39,8 @@ enum { extern const char *ceph_conf_level_name(int level); +extern const char *CEPH_CONF_FILE_DEFAULT; + /** This class represents the current Ceph configuration. * * For Ceph daemons, this is the daemon configuration. Log levels, caching -- 2.39.5