From: | "Mike Gilbert (floppym)" <floppym@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-dialup/xl2tpd/files: xl2tpd-init-r1 |
Date: | Tue, 25 Dec 2012 20:48:12 |
Message-Id: | 20121225204800.D14E22171D@flycatcher.gentoo.org |
1 | floppym 12/12/25 20:48:00 |
2 | |
3 | Modified: xl2tpd-init-r1 |
4 | Log: |
5 | Further simplify init script. |
6 | |
7 | (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
8 | |
9 | Revision Changes Path |
10 | 1.3 net-dialup/xl2tpd/files/xl2tpd-init-r1 |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1?rev=1.3&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1?rev=1.3&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1?r1=1.2&r2=1.3 |
15 | |
16 | Index: xl2tpd-init-r1 |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1,v |
19 | retrieving revision 1.2 |
20 | retrieving revision 1.3 |
21 | diff -u -r1.2 -r1.3 |
22 | --- xl2tpd-init-r1 25 Dec 2012 17:58:13 -0000 1.2 |
23 | +++ xl2tpd-init-r1 25 Dec 2012 20:48:00 -0000 1.3 |
24 | @@ -1,33 +1,12 @@ |
25 | #!/sbin/runscript |
26 | # Copyright 1999-2012 Gentoo Foundation |
27 | # Distributed under the terms of the GNU General Public License v2 |
28 | -# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1,v 1.2 2012/12/25 17:58:13 floppym Exp $ |
29 | +# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1,v 1.3 2012/12/25 20:48:00 floppym Exp $ |
30 | |
31 | -depend() { |
32 | - need net |
33 | -} |
34 | - |
35 | -checkconfig() { |
36 | - if [ ! -f /etc/xl2tpd/xl2tpd.conf ] ; then |
37 | - eerror "Missing /etc/xl2tpd/xl2tpd.conf configuration file!" |
38 | - return 1 |
39 | - fi |
40 | - |
41 | - checkpath -d -m 755 /var/run/xl2tpd |
42 | - |
43 | - return 0 |
44 | -} |
45 | - |
46 | -start() { |
47 | - checkconfig || return 1 |
48 | - |
49 | - ebegin "Starting xl2tpd" |
50 | - start-stop-daemon --start --quiet --exec /usr/sbin/xl2tpd |
51 | - eend $? |
52 | -} |
53 | +command="/usr/sbin/xl2tpd" |
54 | +pidfile="/var/run/xl2tpd.pid" |
55 | +required_files="/etc/xl2tpd/xl2tpd.conf" |
56 | |
57 | -stop() { |
58 | - ebegin "Stopping xl2tpd" |
59 | - start-stop-daemon --stop --quiet --pidfile /var/run/xl2tpd.pid |
60 | - eend $? |
61 | +start_pre() { |
62 | + checkpath -d /var/run/xl2tpd |
63 | } |