c22442cf09
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>
55 lines
1.2 KiB
Diff
55 lines
1.2 KiB
Diff
From f658722ec239a258cd3ec2e828ca3f37ba2fe536 Mon Sep 17 00:00:00 2001
|
|
From: Don Penney <don.penney@windriver.com>
|
|
Date: Fri, 17 Jun 2016 00:31:20 -0400
|
|
Subject: [PATCH 1/1] Notify rmon of shutdown before shutting down LVM and
|
|
Filesystem
|
|
|
|
---
|
|
heartbeat/Filesystem | 9 +++++----
|
|
heartbeat/LVM | 9 +++++----
|
|
2 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
|
|
index 05e4097..d5f3417 100755
|
|
--- a/heartbeat/Filesystem
|
|
+++ b/heartbeat/Filesystem
|
|
@@ -1200,10 +1200,11 @@ case $OP in
|
|
validate-all) Filesystem_validate_all
|
|
exit $?
|
|
;;
|
|
- stop) Filesystem_stop
|
|
- rc=$?
|
|
- rmon_notify "disabled" 300
|
|
- exit $rc
|
|
+ stop)
|
|
+ rmon_notify "disabled" 300
|
|
+ Filesystem_stop
|
|
+ rc=$?
|
|
+ exit $rc
|
|
;;
|
|
esac
|
|
|
|
diff --git a/heartbeat/LVM b/heartbeat/LVM
|
|
index 38092f9..893ece8 100755
|
|
--- a/heartbeat/LVM
|
|
+++ b/heartbeat/LVM
|
|
@@ -879,10 +879,11 @@ case "$1" in
|
|
fi
|
|
exit $rc;;
|
|
|
|
- stop) LVM_stop $VOLUME
|
|
- rc=$?
|
|
- rmon_notify "disabled" 300
|
|
- exit $rc;;
|
|
+ stop)
|
|
+ rmon_notify "disabled" 300
|
|
+ LVM_stop $VOLUME
|
|
+ rc=$?
|
|
+ exit $rc;;
|
|
|
|
status) LVM_status $VOLUME $1
|
|
rc=$?
|
|
--
|
|
2.7.4
|
|
|