Build: configure: Rename CRM_PACEMAKER_DIR to PCMK__PERSISTENT_DATA_DIR.

ClusterLabs · Aug 19, 2024 · fabd0a4 · fabd0a4
1 parent 2e96899
commit fabd0a4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/configure.ac b/configure.ac
@@ -805,10 +805,10 @@ AC_DEFINE_UNQUOTED([CRM_CORE_DIR], ["$CRM_CORE_DIR"],
                    [Directory Pacemaker daemons should change to (without systemd, core files will go here)])
 AC_SUBST(CRM_CORE_DIR)
 
-CRM_PACEMAKER_DIR="${localstatedir}/lib/pacemaker"
-AC_DEFINE_UNQUOTED([CRM_PACEMAKER_DIR], ["$CRM_PACEMAKER_DIR"],
+PCMK__PERSISTENT_DATA_DIR="${localstatedir}/lib/pacemaker"
+AC_DEFINE_UNQUOTED([PCMK__PERSISTENT_DATA_DIR], ["$PCMK__PERSISTENT_DATA_DIR"],
                    [Location to store directory produced by Pacemaker daemons])
-AC_SUBST(CRM_PACEMAKER_DIR)
+AC_SUBST(PCMK__PERSISTENT_DATA_DIR)
 
 CRM_BLACKBOX_DIR="${localstatedir}/lib/pacemaker/blackbox"
 AC_DEFINE_UNQUOTED([CRM_BLACKBOX_DIR], ["$CRM_BLACKBOX_DIR"],

diff --git a/daemons/pacemakerd/pacemakerd.c b/daemons/pacemakerd/pacemakerd.c
@@ -152,11 +152,11 @@ create_pcmk_dirs(void)
     gid_t pcmk_gid = 0;
 
     const char *dirs[] = {
-        CRM_PACEMAKER_DIR, // core/blackbox/scheduler/CIB files
-        CRM_CORE_DIR,      // core files
-        CRM_BLACKBOX_DIR,  // blackbox dumps
-        PE_STATE_DIR,      // scheduler inputs
-        CRM_CONFIG_DIR,    // the Cluster Information Base (CIB)
+        PCMK__PERSISTENT_DATA_DIR,  // core/blackbox/scheduler/CIB files
+        CRM_CORE_DIR,               // core files
+        CRM_BLACKBOX_DIR,           // blackbox dumps
+        PE_STATE_DIR,               // scheduler inputs
+        CRM_CONFIG_DIR,             // the Cluster Information Base (CIB)
         // Don't build CRM_RSCTMP_DIR, the executor will do it
         NULL
     };

diff --git a/etc/sysconfig/pacemaker.in b/etc/sysconfig/pacemaker.in
@@ -374,4 +374,4 @@
 # commands, which would otherwise leave a bunch of unremovable files in /tmp.
 #
 # Default: VALGRIND_OPTS=""
-VALGRIND_OPTS="--leak-check=full --trace-children=no --vgdb=no --num-callers=25 --log-file=@CRM_PACEMAKER_DIR@/valgrind-%p --suppressions=@datadir@/pacemaker/tests/valgrind-pcmk.suppressions --gen-suppressions=all"
+VALGRIND_OPTS="--leak-check=full --trace-children=no --vgdb=no --num-callers=25 --log-file=@PCMK__PERSISTENT_DATA_DIR@/valgrind-%p --suppressions=@datadir@/pacemaker/tests/valgrind-pcmk.suppressions --gen-suppressions=all"