commit: 44bac3c3798f7eb9186c3ea8774552aa191bfae7 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> AuthorDate: Tue May 30 23:48:33 2017 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Tue May 30 23:48:33 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=44bac3c3
Change killprocs to use kill_all instead of killall5 X-Gentoo-Bug:376977 X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=376977 conf.d/killprocs | 5 ++++- init.d/killprocs.in | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conf.d/killprocs b/conf.d/killprocs index 0cf10d0d..76a2bc9c 100644 --- a/conf.d/killprocs +++ b/conf.d/killprocs @@ -1,3 +1,6 @@ -# If you wish to pass any options to killall5 during shutdown, +# If you wish to pass any options to kill_all during shutdown, # you should do so here. +# +# The setting is called killall5_opts because the options here are meant +# to be identical to those you could pass to killall5. killall5_opts="" diff --git a/init.d/killprocs.in b/init.d/killprocs.in index d1409c51..fcf1364d 100644 --- a/init.d/killprocs.in +++ b/init.d/killprocs.in @@ -19,9 +19,9 @@ depend() start() { ebegin "Terminating remaining processes" - killall5 -15 ${killall5_opts} + kill_all 15 ${killall5_opts} eend 0 ebegin "Killing remaining processes" - killall5 -9 ${killall5_opts} + kill_all 9 ${killall5_opts} eend 0 }
