summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-12-25 20:48:00 +0000
committerMike Gilbert <floppym@gentoo.org>2012-12-25 20:48:00 +0000
commit6bba4a18c62b0a6d3b7fae100532443e4b4f1648 (patch)
tree3135a52d557b2c92862f74518a85faf2cbc4f444 /net-dialup
parent[bump] dev-perl/MIME-Types-1.370.0 (diff)
downloadgentoo-2-6bba4a18c62b0a6d3b7fae100532443e4b4f1648.tar.gz
gentoo-2-6bba4a18c62b0a6d3b7fae100532443e4b4f1648.tar.bz2
gentoo-2-6bba4a18c62b0a6d3b7fae100532443e4b4f1648.zip
Further simplify init script.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/xl2tpd/ChangeLog5
-rw-r--r--net-dialup/xl2tpd/files/xl2tpd-init-r133
2 files changed, 10 insertions, 28 deletions
diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index 1779ed03dba1..a5d5c347717e 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-dialup/xl2tpd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.30 2012/12/25 17:58:12 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.31 2012/12/25 20:48:00 floppym Exp $
+
+ 25 Dec 2012; Mike Gilbert <floppym@gentoo.org> files/xl2tpd-init-r1:
+ Further simplify init script.
*xl2tpd-1.3.1-r1 (25 Dec 2012)
diff --git a/net-dialup/xl2tpd/files/xl2tpd-init-r1 b/net-dialup/xl2tpd/files/xl2tpd-init-r1
index af069692f009..372b0cdd9097 100644
--- a/net-dialup/xl2tpd/files/xl2tpd-init-r1
+++ b/net-dialup/xl2tpd/files/xl2tpd-init-r1
@@ -1,33 +1,12 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1,v 1.2 2012/12/25 17:58:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1,v 1.3 2012/12/25 20:48:00 floppym Exp $
-depend() {
- need net
-}
-
-checkconfig() {
- if [ ! -f /etc/xl2tpd/xl2tpd.conf ] ; then
- eerror "Missing /etc/xl2tpd/xl2tpd.conf configuration file!"
- return 1
- fi
-
- checkpath -d -m 755 /var/run/xl2tpd
-
- return 0
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting xl2tpd"
- start-stop-daemon --start --quiet --exec /usr/sbin/xl2tpd
- eend $?
-}
+command="/usr/sbin/xl2tpd"
+pidfile="/var/run/xl2tpd.pid"
+required_files="/etc/xl2tpd/xl2tpd.conf"
-stop() {
- ebegin "Stopping xl2tpd"
- start-stop-daemon --stop --quiet --pidfile /var/run/xl2tpd.pid
- eend $?
+start_pre() {
+ checkpath -d /var/run/xl2tpd
}