diff options
author | Cédric Krier <cedk@gentoo.org> | 2008-11-01 15:50:06 +0000 |
---|---|---|
committer | Cédric Krier <cedk@gentoo.org> | 2008-11-01 15:50:06 +0000 |
commit | fa9b670e024722b579aaf18cdfdde0d3d17cdc9e (patch) | |
tree | b2a5dbda7246437cef618b78596bd147bfa88066 /net-misc | |
parent | Add dependency to pkgconfig for bug #244606 (diff) | |
download | gentoo-2-fa9b670e024722b579aaf18cdfdde0d3d17cdc9e.tar.gz gentoo-2-fa9b670e024722b579aaf18cdfdde0d3d17cdc9e.tar.bz2 gentoo-2-fa9b670e024722b579aaf18cdfdde0d3d17cdc9e.zip |
Fix init script for bug #234667
(Portage version: 2.1.4.5)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/openvpn/ChangeLog | 5 | ||||
-rwxr-xr-x | net-misc/openvpn/files/openvpn-2.1.init | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index 699484dd3983..9391fef3a2a7 100644 --- a/net-misc/openvpn/ChangeLog +++ b/net-misc/openvpn/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openvpn # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.138 2008/09/28 12:48:09 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.139 2008/11/01 15:50:06 cedk Exp $ + + 01 Nov 2008; Cédric Krier <cedk@gentoo.org> files/openvpn-2.1.init: + Fix init script for bug #234667 28 Sep 2008; Cédric Krier <cedk@gentoo.org> +files/openvpn-2.1_rc9-tests.patch, openvpn-2.1_rc9.ebuild: diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-misc/openvpn/files/openvpn-2.1.init index daa163582173..ae8d5980fc07 100755 --- a/net-misc/openvpn/files/openvpn-2.1.init +++ b/net-misc/openvpn/files/openvpn-2.1.init @@ -107,11 +107,12 @@ start() { fi # Ensure that our scripts get the PEER_DNS variable - export PEER_DNS + [ -n "${PEER_DNS}" ] && args="${args} --setenv PEER_DNS ${PEER_DNS}" [ "${reenter}" = "yes" ] && mark_service_inactive "${SVCNAME}" start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \ - -- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args} + -- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon \ + --setenv SVCNAME "${SVCNAME}" ${args} eend $? "Check your logs to see why startup failed" } |