summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 06:50:54 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 06:50:54 +0000
commit7a366520dc4f3e6d2ed07fa78f1c6d439357ad07 (patch)
tree6bab43bfba7ca0ef9fa43194652d7fd62dbf8ffe /debian/patches
parentAdding debian version 4.12.1-1. (diff)
downloadfence-agents-debian.tar.xz
fence-agents-debian.zip
Adding debian version 4.12.1-2~exp1.debian/4.12.1-2_exp1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/patches/enable-zvm-agent17
-rw-r--r--debian/patches/fence-vmware-helper16
-rw-r--r--debian/patches/series2
3 files changed, 17 insertions, 18 deletions
diff --git a/debian/patches/enable-zvm-agent b/debian/patches/enable-zvm-agent
deleted file mode 100644
index 4b50e40..0000000
--- a/debian/patches/enable-zvm-agent
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Leave zvm enabled
- Remove agent after bookworm release.
-Author: Valentin Vidic <vvidic@debian.org>
-Last-Update: 2023-01-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure.ac
-+++ b/configure.ac
-@@ -196,7 +196,7 @@
- fi
-
- FENCE_ZVM=0
--if echo "$AGENTS_LIST" | grep -q -E "zvm( |$)"; then
-+if echo "$AGENTS_LIST" | grep -q -E "all|zvm( |$)"; then
- FENCE_ZVM=1
- fi
-
diff --git a/debian/patches/fence-vmware-helper b/debian/patches/fence-vmware-helper
new file mode 100644
index 0000000..f5dbb34
--- /dev/null
+++ b/debian/patches/fence-vmware-helper
@@ -0,0 +1,16 @@
+Description: Use helper from libexec directory
+Author: Valentin Vidic <vvidic@debian.org>
+Last-Update: 2023-04-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/agents/vmware/fence_vmware.py
++++ b/agents/vmware/fence_vmware.py
+@@ -41,7 +41,7 @@
+ VMRUN_MINIMUM_REQUIRED_VERSION = 2
+
+ # Default path to vmhelper command
+-VMHELPER_COMMAND = "fence_vmware_helper"
++VMHELPER_COMMAND = "/usr/libexec/fence-agents/fence_vmware_helper"
+ # Default path to vmrun command
+ VMRUN_COMMAND = "/usr/bin/vmrun"
+ # Default type of vmware
diff --git a/debian/patches/series b/debian/patches/series
index 9c1a18a..dc1af89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,5 @@ disable-network-access
spelling
systemd-syslog-target
logging-warn-deprecated
-enable-zvm-agent
fence-virt-key
+fence-vmware-helper