Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pcs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
pcs
Commits
57858372
Commit
57858372
authored
Jul 19, 2025
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
killall is at /bin/killall
parent
0dcc33f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
0 deletions
+55
-0
Makefile
Makefile
+1
-0
pcs-0.10.8-fix_killall.patch
pcs-0.10.8-fix_killall.patch
+54
-0
No files found.
Makefile
View file @
57858372
...
@@ -22,6 +22,7 @@ all:
...
@@ -22,6 +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
$(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
0 → 100644
View file @
57858372
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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment