From 6159a32f39afc60d88602cc796cef6a395bb78bf Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 19 Mar 2008 19:57:24 +0000 Subject: SVCNAME -> RC_SVCNAME, but export SVCNAME still for compat. --- init.d.misc/dnsmasq.in | 2 +- init.d.misc/openvpn.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'init.d.misc') diff --git a/init.d.misc/dnsmasq.in b/init.d.misc/dnsmasq.in index da7b5fb6..02e146c1 100644 --- a/init.d.misc/dnsmasq.in +++ b/init.d.misc/dnsmasq.in @@ -18,7 +18,7 @@ depend() reload() { - ebegin "Reloading ${SVCNAME}" + ebegin "Reloading ${RC_SVCNAME}" start-stop-daemon --signal SIGHUP --pidfile "${pidfile}" eend $? } diff --git a/init.d.misc/openvpn.in b/init.d.misc/openvpn.in index 9e55f42b..4f60b83a 100644 --- a/init.d.misc/openvpn.in +++ b/init.d.misc/openvpn.in @@ -2,12 +2,12 @@ # Copyright 2007-2008 Roy Marples # All rights reserved. Released under the 2-clause BSD license. -vpn=${SVCNAME#*.} +vpn=${RC_SVCNAME#*.} name="OpenVPN" [ "${vpn}" != "openvpn" ] && name="${name} (${vpn})" command=@PKG_PREFIX@/sbin/openvpn -pidfile=@VARBASE@/run/"${SVCNAME}".pid +pidfile=@VARBASE@/run/"${RC_SVCNAME}".pid openvpn_dir=${openvpn_dir:-@PKG_PREFIX@/etc/openvpn} openvpn_config=${openvpn_config:-${openvpn_dir}/${vpn}.conf} command_args="${openvpn_args} --daemon --config ${openvpn_config} --writepid ${pidfile}" -- cgit v1.2.3