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. --- support/openvpn/down.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'support/openvpn/down.sh') diff --git a/support/openvpn/down.sh b/support/openvpn/down.sh index 686838a..b58abb9 100755 --- a/support/openvpn/down.sh +++ b/support/openvpn/down.sh @@ -3,7 +3,7 @@ # All rights reserved. Released under the 2-clause BSD license. # If we have a service specific script, run this now -[ -x "${SVCNAME}"-down.sh ] && "${SVCNAME}"-down.sh +[ -x "${RC_SVCNAME}"-down.sh ] && "${RC_SVCNAME}"-down.sh # Restore resolv.conf to how it was if type resolvconf >/dev/null 2>&1; then @@ -16,12 +16,10 @@ elif [ -e /etc/resolv.conf-"${dev}".sv ]; then fi # Re-enter the init script to stop any dependant services -service=/etc/init.d/"${SVCNAME}" -[ ! -x "${service}" ] && service=/usr/local/etc/init.d/"${SVCNAME}" -if [ -x "${service}" ]; then - if "${service}" --quiet status; then +if [ -x "${RC_SERVICE}" ]; then + if "${RC_SERVICE}" --quiet status; then export IN_BACKGROUND=YES - "${service}" --quiet stop + "${RC_SERVICE}" --quiet stop fi fi -- cgit v1.2.3