[patch] tuntap.sh openvpn tunctl_ patch

tuntap.sh.patch (text/plain), 712 bytes, created by impulze on 2008-01-02 02:22:32 UTC

--- tuntap.sh.orig	2008-01-02 03:11:23.000000000 +0100
+++ tuntap.sh	2008-01-02 03:14:02.000000000 +0100
@@ -57,6 +57,7 @@
 tuntap_pre_start() {
 	local iface="$1" ifvar=$(bash_variable "$1")
 	local tuntap="tuntap_${ifvar}"
+	local opts="tunctl_${ifvar}"
 
 	[[ -z ${!tuntap} ]] && return 0
 	tuntap_check_kernel || return 1
@@ -65,12 +66,11 @@
 
 	# Set the base metric to 1000
 	metric=1000
-	
-	if [[ -x /usr/sbin/openvpn ]] ; then
+
+	if [[ -z "${!opts}" ]] && [[ -x /usr/sbin/openvpn ]] ; then
 		openvpn --mktun --dev-type "${!tuntap}" --dev "${iface}" \
 			> /dev/null
 	else
-		local opts="tunctl_${ifvar}"
 		tunctl ${!opts} -t "${iface}" >/dev/null
 	fi
 	eend $? && save_options tuntap "${!tuntap}"