summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-03-10 12:19:28 +0000
committerRoy Marples <uberlord@gentoo.org>2006-03-10 12:19:28 +0000
commita700deb6d173649537d83a5e2b67c48c2b37018c (patch)
tree4e1b3b0a11c2e189685b2ebbb74d064c5f545fdf /net-misc
parentupdate patchset to 0.6, added fix for shutdown, tvmovie-crash (diff)
downloadgentoo-2-a700deb6d173649537d83a5e2b67c48c2b37018c.tar.gz
gentoo-2-a700deb6d173649537d83a5e2b67c48c2b37018c.tar.bz2
gentoo-2-a700deb6d173649537d83a5e2b67c48c2b37018c.zip
Prefer SVCNAME over myservice
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openvpn/files/openvpn.init8
1 files changed, 4 insertions, 4 deletions
diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init
index c0a17383b5e5..7a10457087ee 100644
--- a/net-misc/openvpn/files/openvpn.init
+++ b/net-misc/openvpn/files/openvpn.init
@@ -3,8 +3,8 @@
# Distributed under the terms of the GNU General Public License v2
VPNDIR="/etc/openvpn"
-VPN="${myservice##*.}"
-if [[ -n ${VPN} && ${myservice} != "openvpn" ]]; then
+VPN="${SVCNAME##*.}"
+if [[ -n ${VPN} && ${SVCNAME} != "openvpn" ]]; then
VPNPID="/var/run/openvpn.${VPN}.pid"
else
VPNPID="/var/run/openvpn.pid"
@@ -31,7 +31,7 @@ checktundevice() {
}
start() {
- ebegin "Starting ${myservice}"
+ ebegin "Starting ${SVCNAME}"
checktundevice || return 1
@@ -53,7 +53,7 @@ start() {
}
stop() {
- ebegin "Stopping ${myservice}"
+ ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --exec /usr/sbin/openvpn --pidfile "${VPNPID}"
eend $?
}