From 8c67996590004c5b545cfcadf16c1e9223766426 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 10 Oct 2009 23:27:13 +0000 Subject: Switch killall to ssd #279931 by Michał Górny. (Portage version: 2.2_rc42/cvs/Linux x86_64) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-apps/xinetd/ChangeLog | 5 ++++- sys-apps/xinetd/files/xinetd.rc6 | 26 +++++++++----------------- 2 files changed, 13 insertions(+), 18 deletions(-) (limited to 'sys-apps/xinetd') diff --git a/sys-apps/xinetd/ChangeLog b/sys-apps/xinetd/ChangeLog index c70b30074635..90c0ca6b6d0d 100644 --- a/sys-apps/xinetd/ChangeLog +++ b/sys-apps/xinetd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/xinetd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.49 2009/06/20 12:18:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.50 2009/10/10 23:27:07 vapier Exp $ + + 10 Oct 2009; Mike Frysinger files/xinetd.rc6: + Switch killall to ssd #279931 by Michał Górny. 20 Jun 2009; Mike Frysinger xinetd-2.3.14.ebuild: Switch to emake in src_install and drop old pkg_postinst messages. diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6 index 42488dcb623c..1cd25910357a 100644 --- a/sys-apps/xinetd/files/xinetd.rc6 +++ b/sys-apps/xinetd/files/xinetd.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.21 2009/01/02 20:39:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.22 2009/10/10 23:27:13 vapier Exp $ opts="reload dump check" @@ -22,20 +22,12 @@ stop() { eend $? } -reload() { - ebegin "Reloading configuration" - killall -HUP xinetd &>/dev/null - eend $? -} - -dump() { - ebegin "Dumping configuration" - killall -USR1 xinetd &>/dev/null - eend $? -} - -check() { - ebegin "Performing Consistency Check" - killall -IOT xinetd &>/dev/null +do_sig() { + local sig=$1 ; shift + ebegin "$*" + start-stop-daemon --stop --signal ${sig} --pidfile /var/run/xinetd.pid eend $? } +reload() { do_sig HUP "Reloading configuration" ; } +dump() { do_sig USR1 "Dumping configuration" ; } +check() { do_sig IOT "Performing Consistency Check" ; } -- cgit v1.2.3-65-gdbad