summaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-04-26 12:11:58 -0500
committerWilliam Hubbs <williamh@gentoo.org>2012-04-26 12:11:58 -0500
commit3967077da3901b4f10d71dec1ee977af36fae956 (patch)
tree0f8052c83ecb8a2c0f36659515ccced8d4b5f1a1 /sh
parentf971c4c0b5e45500f1255f2e076f2c101d2f9281 (diff)
downloadopenrc-3967077da3901b4f10d71dec1ee977af36fae956.tar.gz
openrc-3967077da3901b4f10d71dec1ee977af36fae956.tar.bz2
openrc-3967077da3901b4f10d71dec1ee977af36fae956.tar.xz
Revert "Revert "Let runscript enter the service dir before expand globs""
This reverts commit f971c4c0b5e45500f1255f2e076f2c101d2f9281. After further discussion, this is a good first step toward a fix, so I am putting it back.
Diffstat (limited to 'sh')
-rw-r--r--sh/runscript.sh.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index 15cdb86..a4d9e7c 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -174,6 +174,10 @@ status()
yesno $RC_DEBUG && set -x
+# Enter the dir of the init script to fix the globbing with e.g. depend()
+# bug 412677
+cd ${RC_SERVICE%/*}
+
_conf_d=${RC_SERVICE%/*}/../conf.d
# If we're net.eth0 or openvpn.work then load net or openvpn config
_c=${RC_SVCNAME%%.*}