diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-12-31 09:06:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-12-31 09:06:44 +0000 |
| commit | 77662bf8fa23f203ba488fbcb4cb455f004f03ba (patch) | |
| tree | a162df40c49e3ba564fc54834a84f740126076bc /sys-apps/xinetd | |
| parent | old (diff) | |
| download | gentoo-2-77662bf8fa23f203ba488fbcb4cb455f004f03ba.tar.gz gentoo-2-77662bf8fa23f203ba488fbcb4cb455f004f03ba.tar.bz2 gentoo-2-77662bf8fa23f203ba488fbcb4cb455f004f03ba.zip | |
Drop funky custom env cleaning as ssd does it for us now #253178 by Erik Hahn.
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'sys-apps/xinetd')
| -rw-r--r-- | sys-apps/xinetd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/xinetd/files/xinetd.rc6 | 19 |
2 files changed, 13 insertions, 12 deletions
diff --git a/sys-apps/xinetd/ChangeLog b/sys-apps/xinetd/ChangeLog index 0548d4608475..cc915ac6f5cb 100644 --- a/sys-apps/xinetd/ChangeLog +++ b/sys-apps/xinetd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/xinetd # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.46 2008/12/20 09:45:38 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.47 2008/12/31 09:06:44 vapier Exp $ + + 31 Dec 2008; Mike Frysinger <vapier@gentoo.org> files/xinetd.rc6: + Drop funky custom env cleaning as ssd does it for us now #253178 by Erik + Hahn. 20 Dec 2008; Peter Volkov <pva@gentoo.org> xinetd-2.3.13.ebuild, xinetd-2.3.14.ebuild: diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6 index 72b338690da5..31104fc75c9e 100644 --- a/sys-apps/xinetd/files/xinetd.rc6 +++ b/sys-apps/xinetd/files/xinetd.rc6 @@ -1,9 +1,9 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2008 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.19 2005/07/30 07:34:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.20 2008/12/31 09:06:44 vapier Exp $ -opts="start stop reload restart dump check" +opts="reload dump check" depend() { use net @@ -11,11 +11,8 @@ depend() { start() { ebegin "Starting xinetd" - ( - # workaround for #25754 - unset -f `declare -F | sed 's:declare -f::g'` - /usr/sbin/xinetd -pidfile /var/run/xinetd.pid ${XINETD_OPTS} - ) + start-stop-daemon --start --pidfile /var/run/xinetd.pid -- \ + xinetd -pidfile /var/run/xinetd.pid ${XINETD_OPTS} eend $? } @@ -25,19 +22,19 @@ stop() { eend $? } -reload(){ +reload() { ebegin "Reloading configuration" killall -HUP xinetd &>/dev/null eend $? } -dump(){ +dump() { ebegin "Dumping configuration" killall -USR1 xinetd &>/dev/null eend $? } -check(){ +check() { ebegin "Performing Consistency Check" killall -IOT xinetd &>/dev/null eend $? |