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>
57 lines
1.5 KiB
Diff
57 lines
1.5 KiB
Diff
From 72fdb47d6d79b950fc900c88d77605911cdcb4b1 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:11:58 -0400
|
|
Subject: [PATCH 02/10] WRS: spec-avoid-dir-collisions.patch
|
|
|
|
---
|
|
SPECS/resource-agents.spec | 17 +++++++++--------
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
|
|
index 453398a..52c3c93 100644
|
|
--- a/SPECS/resource-agents.spec
|
|
+++ b/SPECS/resource-agents.spec
|
|
@@ -642,14 +642,15 @@ rm -rf %{buildroot}
|
|
%endif
|
|
|
|
%if %{with linuxha}
|
|
-%dir /usr/lib/ocf
|
|
-%dir /usr/lib/ocf/resource.d
|
|
-%dir /usr/lib/ocf/lib
|
|
+#%dir /usr/lib/ocf
|
|
+#%dir /usr/lib/ocf/resource.d
|
|
+#%dir /usr/lib/ocf/lib
|
|
|
|
-/usr/lib/ocf/lib/heartbeat
|
|
+/usr/lib/ocf/lib/heartbeat/*
|
|
|
|
-/usr/lib/ocf/resource.d/heartbeat
|
|
-/usr/lib/ocf/resource.d/openstack
|
|
+/usr/lib/ocf/resource.d/heartbeat/*
|
|
+/usr/lib/ocf/resource.d/heartbeat/.ocf-*
|
|
+/usr/lib/ocf/resource.d/openstack/*
|
|
%if %{with rgmanager}
|
|
/usr/lib/ocf/resource.d/redhat
|
|
%endif
|
|
@@ -669,7 +670,7 @@ rm -rf %{buildroot}
|
|
|
|
%{_includedir}/heartbeat
|
|
|
|
-%dir %attr (1755, root, root) %{_var}/run/resource-agents
|
|
+#%dir %attr (1755, root, root) %{_var}/run/resource-agents
|
|
|
|
%{_mandir}/man7/*.7*
|
|
|
|
@@ -780,7 +781,7 @@ rm -rf %{buildroot}
|
|
%exclude %{_mandir}/man8/ldirectord.8.gz
|
|
|
|
# For compatability with pre-existing agents
|
|
-%dir %{_sysconfdir}/ha.d
|
|
+#%dir %{_sysconfdir}/ha.d
|
|
%{_sysconfdir}/ha.d/shellfuncs
|
|
|
|
%{_libexecdir}/heartbeat
|
|
--
|
|
1.9.1
|
|
|