[gentoo-commits] gentoo-x86 commit in net-misc/openvpn/files: openvpn-2.1.init

[Cedric Krier (cedk)]

cedk        08/11/01 15:50:06

  Modified:             openvpn-2.1.init
  Log:
  Fix init script for bug #234667
  (Portage version: 2.1.4.5)

Revision  Changes    Path
1.15                 net-misc/openvpn/files/openvpn-2.1.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openvpn/files/openvpn-2.1.init?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openvpn/files/openvpn-2.1.init?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/openvpn/files/openvpn-2.1.init?r1=1.14&r2=1.15

Index: openvpn-2.1.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/files/openvpn-2.1.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openvpn-2.1.init	2 Aug 2008 18:14:53 -0000	1.14
+++ openvpn-2.1.init	1 Nov 2008 15:50:06 -0000	1.15
@@ -107,11 +107,12 @@
 	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"
 }