|
 |
60de42 |
From 6107292b7c01da883a5c8af5d0d2c90e186d4322 Mon Sep 17 00:00:00 2001
|
|
|
60de42 |
From: HideoYamauchi <renayama19661014@ybb.ne.jp>
|
|
|
60de42 |
Date: Thu, 8 Dec 2016 13:25:54 +0900
|
|
|
60de42 |
Subject: [PATCH] Low: mcp: Correction of the difference in access permission
|
|
|
60de42 |
setting.
|
|
|
60de42 |
|
|
|
60de42 |
---
|
|
|
60de42 |
configure.ac | 4 ++++
|
|
|
60de42 |
mcp/pacemaker.c | 12 ++++++++----
|
|
|
60de42 |
2 files changed, 12 insertions(+), 4 deletions(-)
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/configure.ac b/configure.ac
|
|
|
60de42 |
index a7f9158..e51a15b 100644
|
|
|
60de42 |
--- a/configure.ac
|
|
|
60de42 |
+++ b/configure.ac
|
|
|
60de42 |
@@ -1113,6 +1113,10 @@ CRM_STATE_DIR=${localstatedir}/run/crm
|
|
|
60de42 |
AC_DEFINE_UNQUOTED(CRM_STATE_DIR,"$CRM_STATE_DIR", Where to keep state files and sockets)
|
|
|
60de42 |
AC_SUBST(CRM_STATE_DIR)
|
|
|
60de42 |
|
|
|
60de42 |
+CRM_PACEMAKER_DIR=${localstatedir}/lib/pacemaker
|
|
|
60de42 |
+AC_DEFINE_UNQUOTED(CRM_PACEMAKER_DIR,"$CRM_PACEMAKER_DIR", Location to store directory produced by Pacemaker daemons)
|
|
|
60de42 |
+AC_SUBST(CRM_PACEMAKER_DIR)
|
|
|
60de42 |
+
|
|
|
60de42 |
CRM_BLACKBOX_DIR=${localstatedir}/lib/pacemaker/blackbox
|
|
|
60de42 |
AC_DEFINE_UNQUOTED(CRM_BLACKBOX_DIR,"$CRM_BLACKBOX_DIR", Where to keep blackbox dumps)
|
|
|
60de42 |
AC_SUBST(CRM_BLACKBOX_DIR)
|
|
|
60de42 |
diff --git a/mcp/pacemaker.c b/mcp/pacemaker.c
|
|
|
60de42 |
index 292e28c..95c1370 100644
|
|
|
60de42 |
--- a/mcp/pacemaker.c
|
|
|
60de42 |
+++ b/mcp/pacemaker.c
|
|
|
60de42 |
@@ -1058,20 +1058,24 @@ main(int argc, char **argv)
|
|
|
60de42 |
mkdir(CRM_STATE_DIR, 0750);
|
|
|
60de42 |
mcp_chown(CRM_STATE_DIR, pcmk_uid, pcmk_gid);
|
|
|
60de42 |
|
|
|
60de42 |
+ /* Used to store core/blackbox/pengine/cib files in */
|
|
|
60de42 |
+ crm_build_path(CRM_PACEMAKER_DIR, 0750);
|
|
|
60de42 |
+ mcp_chown(CRM_PACEMAKER_DIR, pcmk_uid, pcmk_gid);
|
|
|
60de42 |
+
|
|
|
60de42 |
/* Used to store core files in */
|
|
|
60de42 |
- crm_build_path(CRM_CORE_DIR, 0775);
|
|
|
60de42 |
+ crm_build_path(CRM_CORE_DIR, 0750);
|
|
|
60de42 |
mcp_chown(CRM_CORE_DIR, pcmk_uid, pcmk_gid);
|
|
|
60de42 |
|
|
|
60de42 |
/* Used to store blackbox dumps in */
|
|
|
60de42 |
- crm_build_path(CRM_BLACKBOX_DIR, 0755);
|
|
|
60de42 |
+ crm_build_path(CRM_BLACKBOX_DIR, 0750);
|
|
|
60de42 |
mcp_chown(CRM_BLACKBOX_DIR, pcmk_uid, pcmk_gid);
|
|
|
60de42 |
|
|
|
60de42 |
/* Used to store policy engine inputs in */
|
|
|
60de42 |
- crm_build_path(PE_STATE_DIR, 0755);
|
|
|
60de42 |
+ crm_build_path(PE_STATE_DIR, 0750);
|
|
|
60de42 |
mcp_chown(PE_STATE_DIR, pcmk_uid, pcmk_gid);
|
|
|
60de42 |
|
|
|
60de42 |
/* Used to store the cluster configuration */
|
|
|
60de42 |
- crm_build_path(CRM_CONFIG_DIR, 0755);
|
|
|
60de42 |
+ crm_build_path(CRM_CONFIG_DIR, 0750);
|
|
|
60de42 |
mcp_chown(CRM_CONFIG_DIR, pcmk_uid, pcmk_gid);
|
|
|
60de42 |
|
|
|
60de42 |
/* Resource agent paths are constructed by the lrmd */
|
|
|
60de42 |
--
|
|
|
60de42 |
1.8.3.1
|
|
|
60de42 |
|