Compare commits
1 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 1aec9ebbf9 |
33
2075.patch
Normal file
33
2075.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
From ef5552acb8177dc97af6722d2be2041248e1d475 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Varkoly <varkoly@suse.com>
|
||||
Date: Mon, 22 Sep 2025 15:36:07 +0200
|
||||
Subject: [PATCH] Enhance documentation: setproctitle_enable and background
|
||||
must be set correctly. Use -f for pgrep to find the right pid.
|
||||
|
||||
---
|
||||
heartbeat/vsftpd.in | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/vsftpd.in b/heartbeat/vsftpd.in
|
||||
index 3831c4fa82..e62171f554 100644
|
||||
--- a/heartbeat/vsftpd.in
|
||||
+++ b/heartbeat/vsftpd.in
|
||||
@@ -53,7 +53,8 @@ cat <<END
|
||||
<resource-agent name="vsftpd" version="1.0">
|
||||
<version>1.0</version>
|
||||
<longdesc lang="en">
|
||||
-This script manages vsftpd
|
||||
+This script manages vsftpd.
|
||||
+The parameter background in the vsftpd.conf must be set to yes and setproctitle_enable must be disabled. Otherwise the RA can not work.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Manages an vsftpd</shortdesc>
|
||||
|
||||
@@ -155,7 +156,7 @@ vsftpd_start()
|
||||
exit $OCF_ERR_GENERIC
|
||||
fi
|
||||
|
||||
- PID=$( pgrep $OCF_RESKEY_binpath )
|
||||
+ PID=$( pgrep -f $OCF_RESKEY_binpath )
|
||||
case $? in
|
||||
0)
|
||||
ocf_log info "PID file (pid:${PID} at $PIDFILE) created for vsftpd."
|
||||
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 24 08:33:56 UTC 2025 - Peter Varkoly <varkoly@suse.com>
|
||||
|
||||
- L3: OCF Resource Agents for vsftpd failure: No PID found (bsc#1249819)
|
||||
Add patch:
|
||||
2075.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 24 07:38:20 UTC 2025 - Peter Varkoly <varkoly@suse.com>
|
||||
|
||||
|
||||
@@ -32,16 +32,17 @@ Patch2: 0002-nfsserver-fix-path-to-sm-notify.patch
|
||||
Patch3: 0003-ldirectord-don-t-create-subsys-lock.patch
|
||||
# PATCH-FIX-OPENSUSE: Revert moving binaries to /usr/libexec
|
||||
Patch4: 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
|
||||
# PATCH-FIX-OPENSUSE: Remove deprecated perl-IO-Socket-INET6 dependency
|
||||
Patch5: resource-agents-deprecate-INET6.patch
|
||||
## PATCH-FIX-OPENSUSE:
|
||||
%if "%{python_flavor}" == "python311"
|
||||
Patch7: use-python-311.patch
|
||||
%endif
|
||||
Patch8: nfsnotify.patch
|
||||
Patch9: portblock.patch
|
||||
Patch10: bsc-1241692.patch
|
||||
Patch11: 2075.patch
|
||||
|
||||
# PATCH-FIX-OPENSUSE: Remove deprecated perl-IO-Socket-INET6 dependency
|
||||
Patch10: resource-agents-deprecate-INET6.patch
|
||||
Patch11: bsc-1241692.patch
|
||||
|
||||
BuildRequires: %{python_module requests}
|
||||
BuildRequires: %{python_module urllib3}
|
||||
@@ -113,6 +114,7 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
%if "%{python_flavor}" == "python311"
|
||||
%patch -P 7 -p1
|
||||
%endif
|
||||
|
||||
Reference in New Issue
Block a user