Skip to content

GitLab

P
pcs
Commit 6914f3b7 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

find is at /bin/find

parent 57858372
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 7 deletions
Makefile
View file @ 6914f3b7
...@@ -22,7 +22,7 @@ all: ...@@ -22,7 +22,7 @@ all:
mv -v /etc/gshadow /data/etc/gshadow mv -v /etc/gshadow /data/etc/gshadow
ln -sv /data/etc/gshadow /etc/gshadow ln -sv /data/etc/gshadow /etc/gshadow
tar xf pcs-0.10.8.tar.gz tar xf pcs-0.10.8.tar.gz
patch -Np1 -d pcs-0.10.8 < pcs-0.10.8-fix_killall.patch patch -Np1 -d pcs-0.10.8 < pcs-0.10.8-fix_psmisc.patch
$(MAKE) -C pcs-0.10.8 install HOME="/tmp" $(MAKE) -C pcs-0.10.8 install HOME="/tmp"
systemctl enable pcsd systemctl enable pcsd
rm -rf pcs-0.10.8 rm -rf pcs-0.10.8
pcs-0.10.8-fix_killall.patch → pcs-0.10.8-fix_psmisc.patch
View file @ 6914f3b7
diff -uNr pcs-0.10.8/pcs/cluster.py pcs-0.10.8-fix_killall/pcs/cluster.py diff -uNr pcs-0.10.8/pcs/cluster.py pcs-0.10.8-fix_psmisc/pcs/cluster.py
--- pcs-0.10.8/pcs/cluster.py 2021-02-01 19:52:26.000000000 +1030 --- pcs-0.10.8/pcs/cluster.py 2021-02-01 19:52:26.000000000 +1030
+++ pcs-0.10.8-fix_killall/pcs/cluster.py 2025-07-19 16:32:44.138690316 +0930 +++ pcs-0.10.8-fix_psmisc/pcs/cluster.py 2025-07-19 16:36:27.014160734 +0930
@@ -748,7 +748,7 @@ @@ -748,7 +748,7 @@
"corosync-qdevice", "corosync-qdevice",
"corosync", "corosync",
...@@ -10,9 +10,18 @@ diff -uNr pcs-0.10.8/pcs/cluster.py pcs-0.10.8-fix_killall/pcs/cluster.py ...@@ -10,9 +10,18 @@ diff -uNr pcs-0.10.8/pcs/cluster.py pcs-0.10.8-fix_killall/pcs/cluster.py
def cluster_push(lib, argv, modifiers): def cluster_push(lib, argv, modifiers):
diff -uNr pcs-0.10.8/pcs/lib/external.py pcs-0.10.8-fix_killall/pcs/lib/external.py @@ -1383,7 +1383,7 @@
for name in state_files:
dummy_output, dummy_retval = utils.run(
[
- "/usr/bin/find",
+ "/bin/find",
"/var/lib/pacemaker",
"-name",
name,
diff -uNr pcs-0.10.8/pcs/lib/external.py pcs-0.10.8-fix_psmisc/pcs/lib/external.py
--- pcs-0.10.8/pcs/lib/external.py 2021-02-01 19:52:26.000000000 +1030 --- pcs-0.10.8/pcs/lib/external.py 2021-02-01 19:52:26.000000000 +1030
+++ pcs-0.10.8-fix_killall/pcs/lib/external.py 2025-07-19 16:32:51.877532975 +0930 +++ pcs-0.10.8-fix_psmisc/pcs/lib/external.py 2025-07-19 16:36:00.480698337 +0930
@@ -275,7 +275,7 @@ @@ -275,7 +275,7 @@
""" """
# make killall not report that a process is not running # make killall not report that a process is not running
...@@ -22,9 +31,9 @@ diff -uNr pcs-0.10.8/pcs/lib/external.py pcs-0.10.8-fix_killall/pcs/lib/external ...@@ -22,9 +31,9 @@ diff -uNr pcs-0.10.8/pcs/lib/external.py pcs-0.10.8-fix_killall/pcs/lib/external
) )
# If a process isn't running, killall will still return 1 even with --quiet. # If a process isn't running, killall will still return 1 even with --quiet.
# We don't consider that an error, so we check for output string as well. # We don't consider that an error, so we check for output string as well.
diff -uNr pcs-0.10.8/pcs_test/tier0/lib/test_external.py pcs-0.10.8-fix_killall/pcs_test/tier0/lib/test_external.py diff -uNr pcs-0.10.8/pcs_test/tier0/lib/test_external.py pcs-0.10.8-fix_psmisc/pcs_test/tier0/lib/test_external.py
--- pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2021-02-01 19:52:26.000000000 +1030 --- pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2021-02-01 19:52:26.000000000 +1030
+++ pcs-0.10.8-fix_killall/pcs_test/tier0/lib/test_external.py 2025-07-19 16:33:08.680191344 +0930 +++ pcs-0.10.8-fix_psmisc/pcs_test/tier0/lib/test_external.py 2025-07-19 16:36:00.481698317 +0930
@@ -708,7 +708,7 @@ @@ -708,7 +708,7 @@
self.mock_runner.run.return_value = ("", "", 0) self.mock_runner.run.return_value = ("", "", 0)
lib.kill_services(self.mock_runner, self.services) lib.kill_services(self.mock_runner, self.services)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment