From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QZwbU-0002dy-8m for garchives@archives.gentoo.org; Fri, 24 Jun 2011 02:58:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 369971C024; Fri, 24 Jun 2011 02:58:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D92FA1C024 for ; Fri, 24 Jun 2011 02:58:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 462EB1B400F for ; Fri, 24 Jun 2011 02:58:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9D39B8003C for ; Fri, 24 Jun 2011 02:58:26 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <013e7fb9fc08acd33e944659ff8e7a18aee2b69f.williamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/ X-VCS-Repository: proj/openrc X-VCS-Files: conf.d/Makefile.Linux conf.d/killprocs init.d/killprocs.in X-VCS-Directories: init.d/ conf.d/ X-VCS-Committer: williamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 013e7fb9fc08acd33e944659ff8e7a18aee2b69f Date: Fri, 24 Jun 2011 02:58:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: db02d5b121ac5e49a3eb47af248664fd commit: 013e7fb9fc08acd33e944659ff8e7a18aee2b69f Author: William Hubbs gentoo org> AuthorDate: Fri Jun 24 02:52:44 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Jun 24 02:52:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D013e7fb9 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=3D371625 --- 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+=3D consolefont dmesg hwclock keymaps modules +CONF+=3D consolefont dmesg hwclock keymaps killprocs modules SOS=3D 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=3D"" 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 }