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>
28 lines
746 B
Diff
28 lines
746 B
Diff
From eb45b8271ce64a046d41c93b1cffd641245ce55f Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:12:48 -0400
|
|
Subject: [PATCH 05/13] WRS: Patch1109: umount-in-namespace.patch
|
|
|
|
---
|
|
heartbeat/Filesystem | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
|
|
index f536298..05e4097 100755
|
|
--- a/heartbeat/Filesystem
|
|
+++ b/heartbeat/Filesystem
|
|
@@ -804,6 +804,10 @@ signal_processes() {
|
|
}
|
|
try_umount() {
|
|
local SUB=$1
|
|
+
|
|
+ # We need to ensure we umount in namespaces, too
|
|
+ /usr/sbin/umount-in-namespace $SUB
|
|
+
|
|
$UMOUNT $umount_force $SUB
|
|
list_mounts | grep -q " $SUB " >/dev/null 2>&1 || {
|
|
ocf_log info "unmounted $SUB successfully"
|
|
--
|
|
1.9.1
|
|
|