summaryrefslogtreecommitdiff
path: root/sh/runscript.sh.in
diff options
context:
space:
mode:
Diffstat (limited to 'sh/runscript.sh.in')
-rw-r--r--sh/runscript.sh.in33
1 files changed, 14 insertions, 19 deletions
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index 4032cb8..07f96d8 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -16,23 +16,6 @@ sourcex()
fi
}
-loadconfig()
-{
- # If we're net.eth0 or openvpn.work then load net or openvpn config
- _c=${RC_SVCNAME%%.*}
- if [ -n "$_c" -a "$_c" != "$RC_SVCNAME" ]; then
- if ! sourcex -e "$1/$_c.$RC_RUNLEVEL"; then
- sourcex -e "$1/$_c"
- fi
- fi
- unset _c
-
- # Overlay with our specific config
- if ! sourcex -e "$1/$RC_SVCNAME.$RC_RUNLEVEL"; then
- sourcex -e "$1/$RC_SVCNAME"
- fi
-}
-
sourcex "@SYSCONFDIR@/init.d/functions.sh"
sourcex "@LIBEXECDIR@/sh/rc-functions.sh"
@@ -195,9 +178,21 @@ status()
yesno $RC_DEBUG && set -x
-if ! loadconfig "${RC_SERVICE%/*}/../conf.d"; then
- loadconfig "@SYSCONFDIR@/conf.d"
+_conf_d=${RC_SERVICE%/*}/../conf.d
+# If we're net.eth0 or openvpn.work then load net or openvpn config
+_c=${RC_SVCNAME%%.*}
+if [ -n "$_c" -a "$_c" != "$RC_SVCNAME" ]; then
+ if ! sourcex -e "$_conf_d/$_c.$RC_RUNLEVEL"; then
+ sourcex -e "$_conf_d/$_c"
+ fi
+fi
+unset _c
+
+# Overlay with our specific config
+if ! sourcex -e "$_conf_d/$RC_SVCNAME.$RC_RUNLEVEL"; then
+ sourcex -e "$_conf_d/$RC_SVCNAME"
fi
+unset _conf_d
# Load any system overrides
sourcex -e "@SYSCONFDIR@/rc.conf"