diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2005-11-02 12:17:55 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2005-11-02 12:17:55 +0000 |
| commit | ad6ca853a08338c76717809f52e9fc9ad70dbc8f (patch) | |
| tree | 7c51f7ccc638467e7f8f1e931e44b135e7055978 /net-misc/openvpn/files | |
| parent | Fix for bug #109355 from sane-CVS (diff) | |
| download | gentoo-2-ad6ca853a08338c76717809f52e9fc9ad70dbc8f.tar.gz gentoo-2-ad6ca853a08338c76717809f52e9fc9ad70dbc8f.tar.bz2 gentoo-2-ad6ca853a08338c76717809f52e9fc9ad70dbc8f.zip | |
Added myself as a maintainer until luckyduck comes back online
Version bump, wrt bug #111116
Examples flag really now works, #100943
init script now appends the --cd option only when the same option
is not specified in the config file, #109363
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'net-misc/openvpn/files')
| -rw-r--r-- | net-misc/openvpn/files/digest-openvpn-2.0.4 | 1 | ||||
| -rw-r--r-- | net-misc/openvpn/files/openvpn.init | 14 |
2 files changed, 12 insertions, 3 deletions
diff --git a/net-misc/openvpn/files/digest-openvpn-2.0.4 b/net-misc/openvpn/files/digest-openvpn-2.0.4 new file mode 100644 index 000000000000..433162d53832 --- /dev/null +++ b/net-misc/openvpn/files/digest-openvpn-2.0.4 @@ -0,0 +1 @@ +MD5 de32775b88e6bcd737ae93b9a365494c openvpn-2.0.4.tar.gz 653156 diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init index 6933efc4d529..c0a17383b5e5 100644 --- a/net-misc/openvpn/files/openvpn.init +++ b/net-misc/openvpn/files/openvpn.init @@ -1,4 +1,6 @@ #!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 VPNDIR="/etc/openvpn" VPN="${myservice##*.}" @@ -37,10 +39,16 @@ start() { eend 1 "${VPNCONF} does not exist" return 1 fi - + + local args="" + # If the config file does not specify the cd option, we do + # But if we specify it, we override the config option which we do not want + if ! grep -q "^[ \t]*cd[ \t].*" "${VPNCONF}" ; then + args="${args} --cd ${VPNDIR}" + fi + start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \ - -- --config "${VPNCONF}" --writepid "${VPNPID}" \ - --daemon --cd "${VPNDIR}" + -- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args} eend $? "Check your logs to see why startup failed" } |