Files
integ/base/cluster-resource-agents/centos/patches/create-var-run-resource-agents.patch
Sun Austin c22442cf09 de-fuzz resource-agents patches
Problem:
- Centos 7.5 upgraded resource-agentss.
- Porting of resource-agentss patches did not resolve and 'fuzz' in the line
  numbers of the patches.
- If resource-agents is built by rpm 4.11, or default version of rpm
  until 4.14 is compiled, a fuzzy patch results in the creating
  of an .orig file.
- Packaging of resource-agentss failes due to the unexpected, and
  unpackaged .orig file

Solution:
  Safest solution is to de-fuzz our resource-agentss patches.

Story: 2003389
Task: 26755

Change-Id: I14d975368f5e70eea5bae6ac8dcfed2cfd6711ff
Signed-off-by: Sun Austin <austin.sun@intel.com>
2018-09-28 09:04:08 +08:00

29 lines
742 B
Diff

From 5da3820896a51fd018371bbc08900f22ca0ea4a3 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 3 May 2016 21:53:21 -0400
Subject: [PATCH 1/1] Create /var/run/resource-agents, if needed
---
heartbeat/ocf-shellfuncs.in | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in
index 7b5f831..3565e20 100644
--- a/heartbeat/ocf-shellfuncs.in
+++ b/heartbeat/ocf-shellfuncs.in
@@ -166,6 +166,11 @@ __ocf_set_defaults() {
ha_log "ERROR: Need to tell us our resource instance name."
exit $OCF_ERR_ARGS
fi
+
+ # TODO: Find a better way to ensure this dir exists
+ if [ ! -d "$HA_RSCTMP" ]; then
+ mkdir -p $HA_RSCTMP
+ fi
}
hadate() {
--
2.7.4