[gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/

["William Hubbs" <williamh@gentoo.org>]

commit:     013e7fb9fc08acd33e944659ff8e7a18aee2b69f
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 02:52:44 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 02:52:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=013e7fb9

allow options to be passed to killall5

This allows options to be passed to killall5 by the killprocs script.
This was added so that certain processes will not be killed during
shutdown.

x-Gentoo-Bug: 371625
x-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=371625

---
 conf.d/Makefile.Linux |    2 +-
 conf.d/killprocs      |    3 +++
 init.d/killprocs.in   |    4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf.d/Makefile.Linux b/conf.d/Makefile.Linux
index 37745de..369b3df 100644
--- a/conf.d/Makefile.Linux
+++ b/conf.d/Makefile.Linux
@@ -1,2 +1,2 @@
-CONF+=	consolefont dmesg hwclock keymaps modules
+CONF+=	consolefont dmesg hwclock keymaps killprocs modules
 SOS=	Linux

diff --git a/conf.d/killprocs b/conf.d/killprocs
new file mode 100644
index 0000000..0cf10d0
--- /dev/null
+++ b/conf.d/killprocs
@@ -0,0 +1,3 @@
+# If you wish to pass any options to killall5 during shutdown,
+# you should do so here.
+killall5_opts=""

diff --git a/init.d/killprocs.in b/init.d/killprocs.in
index 7132e9e..2d398d2 100644
--- a/init.d/killprocs.in
+++ b/init.d/killprocs.in
@@ -12,11 +12,11 @@ depend()
 start()
 {
 	ebegin "Terminating remaining processes"
-	killall5 -15
+	killall5 -15 ${killall5_opts}
 	sleep 1
 	eend 0
 	ebegin "Killing remaining processes"
-	killall5 -9
+	killall5 -9 ${killall5_opts}
 	sleep 1
 	eend 0
 }