From c82961615e76578f289516262846f41bc7641db0 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Tue, 9 Apr 2013 12:33:28 +0200
Subject: replace tunctl with ip tuntap (#947875)

---
 sysconfig/network-scripts/ifup-eth | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'sysconfig/network-scripts/ifup-eth')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 50e0a37a..e76d4c24 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -64,14 +64,12 @@ if [ "${TYPE}" = "Bridge" ]; then
       done
 fi
 
-# If the device is a tap device, create it with tunctl, if available.
+# Create tap device.
 if [ "${TYPE}" = "Tap" ]; then
-      if [ ! -x /usr/sbin/tunctl ]; then
-          net_log  $"Tap support not available: tunctl not found"
-          exit 1
-      fi
-      [ -n "${OWNER}" ] && OWNER="-u ${OWNER}"
-      /usr/sbin/tunctl ${OWNER} -t ${DEVICE} > /dev/null
+      [ -n "${OWNER}" ] && OWNER="user ${OWNER}"
+      TUNMODE="mode tap"
+      [[ ${DEVICE} == tun* ]] && TUNMODE="mode tun"
+      ip tuntap add ${TUNMODE} ${OWNER} dev ${DEVICE} > /dev/null
 fi
 
 # now check the real state
-- 
cgit v1.2.1