| 1 |
commit: 44bac3c3798f7eb9186c3ea8774552aa191bfae7 |
| 2 |
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue May 30 23:48:33 2017 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 30 23:48:33 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=44bac3c3 |
| 7 |
|
| 8 |
Change killprocs to use kill_all instead of killall5 |
| 9 |
|
| 10 |
X-Gentoo-Bug:376977 |
| 11 |
X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=376977 |
| 12 |
|
| 13 |
conf.d/killprocs | 5 ++++- |
| 14 |
init.d/killprocs.in | 4 ++-- |
| 15 |
2 files changed, 6 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/conf.d/killprocs b/conf.d/killprocs |
| 18 |
index 0cf10d0d..76a2bc9c 100644 |
| 19 |
--- a/conf.d/killprocs |
| 20 |
+++ b/conf.d/killprocs |
| 21 |
@@ -1,3 +1,6 @@ |
| 22 |
-# If you wish to pass any options to killall5 during shutdown, |
| 23 |
+# If you wish to pass any options to kill_all during shutdown, |
| 24 |
# you should do so here. |
| 25 |
+# |
| 26 |
+# The setting is called killall5_opts because the options here are meant |
| 27 |
+# to be identical to those you could pass to killall5. |
| 28 |
killall5_opts="" |
| 29 |
|
| 30 |
diff --git a/init.d/killprocs.in b/init.d/killprocs.in |
| 31 |
index d1409c51..fcf1364d 100644 |
| 32 |
--- a/init.d/killprocs.in |
| 33 |
+++ b/init.d/killprocs.in |
| 34 |
@@ -19,9 +19,9 @@ depend() |
| 35 |
start() |
| 36 |
{ |
| 37 |
ebegin "Terminating remaining processes" |
| 38 |
- killall5 -15 ${killall5_opts} |
| 39 |
+ kill_all 15 ${killall5_opts} |
| 40 |
eend 0 |
| 41 |
ebegin "Killing remaining processes" |
| 42 |
- killall5 -9 ${killall5_opts} |
| 43 |
+ kill_all 9 ${killall5_opts} |
| 44 |
eend 0 |
| 45 |
} |
Archives