Commit 57858372 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

killall is at /bin/killall

parent 0dcc33f1
......@@ -22,6 +22,7 @@ all:
mv -v /etc/gshadow /data/etc/gshadow
ln -sv /data/etc/gshadow /etc/gshadow
tar xf pcs-0.10.8.tar.gz
patch -Np1 -d pcs-0.10.8 < pcs-0.10.8-fix_killall.patch
$(MAKE) -C pcs-0.10.8 install HOME="/tmp"
systemctl enable pcsd
rm -rf pcs-0.10.8
diff -uNr pcs-0.10.8/pcs/cluster.py pcs-0.10.8-fix_killall/pcs/cluster.py
--- 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
@@ -748,7 +748,7 @@
"corosync-qdevice",
"corosync",
]
- return utils.run(["/usr/bin/killall", "-9"] + all_cluster_daemons)
+ return utils.run(["/bin/killall", "-9"] + all_cluster_daemons)
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
--- 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
@@ -275,7 +275,7 @@
"""
# make killall not report that a process is not running
stdout, stderr, retval = runner.run(
- ["/usr/bin/killall", "--quiet", "--signal", "9", "--"] + list(services)
+ ["/bin/killall", "--quiet", "--signal", "9", "--"] + list(services)
)
# 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.
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
--- 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
@@ -708,7 +708,7 @@
self.mock_runner.run.return_value = ("", "", 0)
lib.kill_services(self.mock_runner, self.services)
self.mock_runner.run.assert_called_once_with(
- ["/usr/bin/killall", "--quiet", "--signal", "9", "--"]
+ ["/bin/killall", "--quiet", "--signal", "9", "--"]
+ self.services
)
@@ -719,7 +719,7 @@
lambda: lib.kill_services(self.mock_runner, self.services),
)
self.mock_runner.run.assert_called_once_with(
- ["/usr/bin/killall", "--quiet", "--signal", "9", "--"]
+ ["/bin/killall", "--quiet", "--signal", "9", "--"]
+ self.services
)
@@ -727,7 +727,7 @@
self.mock_runner.run.return_value = ("", "", 1)
lib.kill_services(self.mock_runner, self.services)
self.mock_runner.run.assert_called_once_with(
- ["/usr/bin/killall", "--quiet", "--signal", "9", "--"]
+ ["/bin/killall", "--quiet", "--signal", "9", "--"]
+ 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