diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 06:50:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 06:50:54 +0000 |
| commit | 2d845bd16ad5bbc2ac7c04181ed6d2fe741e4ed7 (patch) | |
| tree | 8f63797a5f4391c2f5b6918c40450407b32e031c /debian/patches | |
| parent | Releasing progress-linux version 4.12.1-1~progress7.99u1. (diff) | |
| download | fence-agents-2d845bd16ad5bbc2ac7c04181ed6d2fe741e4ed7.tar.xz fence-agents-2d845bd16ad5bbc2ac7c04181ed6d2fe741e4ed7.zip | |
Merging debian version 4.12.1-2~exp1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/enable-zvm-agent | 17 | ||||
| -rw-r--r-- | debian/patches/fence-vmware-helper | 16 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
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 |