[patch] Make tunctl the default for tun/tap creation.

p (text/plain), 1.11 KB, created by Giuliano Gagliardi on 2007-06-07 13:02:06 UTC

diff -ru baselayout-1.12.9/lib/rcscripts/net/tuntap.sh baselayout-1.12.9-fixed/lib/rcscripts/net/tuntap.sh
--- baselayout-1.12.9/lib/rcscripts/net/tuntap.sh	2007-01-17 13:58:28.000000000 +0100
+++ baselayout-1.12.9-fixed/lib/rcscripts/net/tuntap.sh	2007-06-07 14:56:30.740448879 +0200
@@ -66,12 +66,12 @@
 	# Set the base metric to 1000
 	metric=1000
 	
-	if [[ -x /usr/sbin/openvpn ]] ; then
+	if [[ -x /usr/bin/tunctl ]] ; then
+       		local opts="tunctl_${ifvar}"
+		tunctl ${!opts} -t "${iface}" >/dev/null
+	else
 		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}"
 }
@@ -86,12 +86,12 @@
 	tuntap_exists "${iface}" || return 0
 
 	ebegin "Destroying Tun/Tap interface ${iface}"
-	if [[ -x /usr/sbin/openvpn ]] ; then
+	if [[ -x /usr/bin/tunctl ]] ; then
+                tunctl -d "${iface}" >/dev/null
+        else
 		openvpn --rmtun \
 			--dev-type "$(get_options tuntap)" \
 			--dev "${iface}" > /dev/null
-	else
-		tunctl -d "${iface}" >/dev/null
 	fi
 	eend $?
 }