dad45a06a5
stx-integ/base/cluster-resource-agents
Move content from stx-gplv2 into stx-integ
Packages will be relocated to
stx-integ:
base/
bash
cgcs-users
cluster-resource-agents
dpkg
haproxy
libfdt
netpbm
rpm
database/
mariadb
filesystem/
iscsi-initiator-utils
filesystem/drbd/
drbd-tools
kernel/kernel-modules/
drbd
integrity
intel-e1000e
intel-i40e
intel-i40evf
intel-ixgbe
intel-ixgbevf
qat17
tpmdd
ldap/
ldapscripts
networking/
iptables
net-tools
Change-Id: I3a4ee4bde0adfd2a486bd5be3a151db85aa4947e
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
55 lines
1.2 KiB
Diff
55 lines
1.2 KiB
Diff
From bf3f5ed67ee862cbd4fd3f4f8c2c3760ebd88900 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 3a52e56..69f284c 100755
|
|
--- a/heartbeat/LVM
|
|
+++ b/heartbeat/LVM
|
|
@@ -891,10 +891,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=$?
|
|
--
|
|
1.9.1
|
|
|