aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-06-23 21:52:44 -0500
committerWilliam Hubbs <williamh@gentoo.org>2011-06-23 21:52:44 -0500
commit013e7fb9fc08acd33e944659ff8e7a18aee2b69f (patch)
tree4c9ce5851b2b3e333a093811a32a0e913c12a1ce
parente152199860b5b9932e727b20eeefa34d870cc93a (diff)
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
-rw-r--r--conf.d/Makefile.Linux2
-rw-r--r--conf.d/killprocs3
-rw-r--r--init.d/killprocs.in4
3 files changed, 6 insertions, 3 deletions
diff --git a/conf.d/Makefile.Linux b/conf.d/Makefile.Linux
index 37745de2..369b3dff 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 00000000..0cf10d0d
--- /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 7132e9ea..2d398d27 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
}