Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/xinetd/files: xinetd.rc6
Date: Wed, 31 Dec 2008 09:06:46
Message-Id: E1LHx2K-0000cF-HY@stork.gentoo.org
1 vapier 08/12/31 09:06:44
2
3 Modified: xinetd.rc6
4 Log:
5 Drop funky custom env cleaning as ssd does it for us now #253178 by Erik Hahn.
6 (Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
7
8 Revision Changes Path
9 1.20 sys-apps/xinetd/files/xinetd.rc6
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6?rev=1.20&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6?rev=1.20&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6?r1=1.19&r2=1.20
14
15 Index: xinetd.rc6
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v
18 retrieving revision 1.19
19 retrieving revision 1.20
20 diff -u -r1.19 -r1.20
21 --- xinetd.rc6 30 Jul 2005 07:34:26 -0000 1.19
22 +++ xinetd.rc6 31 Dec 2008 09:06:44 -0000 1.20
23 @@ -1,9 +1,9 @@
24 #!/sbin/runscript
25 -# Copyright 1999-2004 Gentoo Foundation
26 +# Copyright 1999-2008 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.19 2005/07/30 07:34:26 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.20 2008/12/31 09:06:44 vapier Exp $
30
31 -opts="start stop reload restart dump check"
32 +opts="reload dump check"
33
34 depend() {
35 use net
36 @@ -11,11 +11,8 @@
37
38 start() {
39 ebegin "Starting xinetd"
40 - (
41 - # workaround for #25754
42 - unset -f `declare -F | sed 's:declare -f::g'`
43 - /usr/sbin/xinetd -pidfile /var/run/xinetd.pid ${XINETD_OPTS}
44 - )
45 + start-stop-daemon --start --pidfile /var/run/xinetd.pid -- \
46 + xinetd -pidfile /var/run/xinetd.pid ${XINETD_OPTS}
47 eend $?
48 }
49
50 @@ -25,19 +22,19 @@
51 eend $?
52 }
53
54 -reload(){
55 +reload() {
56 ebegin "Reloading configuration"
57 killall -HUP xinetd &>/dev/null
58 eend $?
59 }
60
61 -dump(){
62 +dump() {
63 ebegin "Dumping configuration"
64 killall -USR1 xinetd &>/dev/null
65 eend $?
66 }
67
68 -check(){
69 +check() {
70 ebegin "Performing Consistency Check"
71 killall -IOT xinetd &>/dev/null
72 eend $?