summaryrefslogtreecommitdiffstats
path: root/distro
diff options
context:
space:
mode:
authorGert Doering <gert@greenie.muc.de>2014-07-08 09:20:54 +0200
committerGert Doering <gert@greenie.muc.de>2014-07-08 21:03:58 +0200
commitcf31d5f32197159691fa9e3e4afcfc35307702d6 (patch)
tree89100c9c426bbe025d94ba82361e00c00ed54432 /distro
parentbbae238d5084012525a61a0e3ab947c414a555ae (diff)
downloadopenvpn-cf31d5f32197159691fa9e3e4afcfc35307702d6.zip
openvpn-cf31d5f32197159691fa9e3e4afcfc35307702d6.tar.gz
openvpn-cf31d5f32197159691fa9e3e4afcfc35307702d6.tar.xz
Call init script helpers with explicit path (./)
The provided OpenVPN init scripts scan /etc/openvpn for *.conf and run an OpenVPN process for each, and if a .sh script with the same base name exists, this is run before openvpn. Change from running "$name.sh" to "./$name.sh" - depending on the shell used, the script won't be found otherwise, and ensuring that the script isn't searched in $PATH is the right thing anyway. Reported in trac #423 Signed-off-by: Gert Doering <gert@greenie.muc.de> Acked-by: David Sommerseth <dazo@users.sourceforge.net> Message-Id: <1404804054-32424-1-git-send-email-gert@greenie.muc.de> URL: http://article.gmane.org/gmane.network.openvpn.devel/8858
Diffstat (limited to 'distro')
-rwxr-xr-xdistro/rpm/openvpn.init.d.rhel2
-rw-r--r--distro/rpm/openvpn.init.d.suse2
2 files changed, 2 insertions, 2 deletions
diff --git a/distro/rpm/openvpn.init.d.rhel b/distro/rpm/openvpn.init.d.rhel
index 821abd5..cdf3e9d 100755
--- a/distro/rpm/openvpn.init.d.rhel
+++ b/distro/rpm/openvpn.init.d.rhel
@@ -148,7 +148,7 @@ case "$1" in
for c in `/bin/ls *.conf 2>/dev/null`; do
bn=${c%%.conf}
if [ -f "$bn.sh" ]; then
- . $bn.sh
+ . ./$bn.sh
fi
rm -f $piddir/$bn.pid
$openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work
diff --git a/distro/rpm/openvpn.init.d.suse b/distro/rpm/openvpn.init.d.suse
index 2bac7f3..270024e 100644
--- a/distro/rpm/openvpn.init.d.suse
+++ b/distro/rpm/openvpn.init.d.suse
@@ -161,7 +161,7 @@ case "$1" in
for c in `/bin/ls *.conf 2>/dev/null`; do
bn=${c%%.conf}
if [ -f "$bn.sh" ]; then
- . $bn.sh
+ . ./$bn.sh
fi
rm -f $piddir/$bn.pid
$openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work