File sysconfig-ifup-tunnel-allow-existing-tap.bnc557... of Package sysconfig

Overview Repositories Revisions Requests Users Attributes Meta

File sysconfig-ifup-tunnel-allow-existing-tap.bnc557864.diff of Package sysconfig

From 457163fe717fe3ff20eb83e4fb033df34fe98f91 Mon Sep 17 00:00:00 2001
From: mt <mt@bf393798-0adf-0310-9952-bd479070b6c1>
Date: Mon, 14 Dec 2009 14:09:16 +0000
Subject: [PATCH] Fix to allow ifup $tap when tap is already created by e.g. kvm
 (bnc#557864).

---
 scripts/ifup-tunnel |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/scripts/ifup-tunnel b/scripts/ifup-tunnel
index da9e6f7..295af49 100755
--- a/scripts/ifup-tunnel
+++ b/scripts/ifup-tunnel
@@ -252,8 +252,20 @@ up)
 		esac
 	;;
 	tun|tap)
-		# we use a persistent tunnel by default
-		if [ "$TUNNEL_SET_PERSISTENT" != no ] ; then
+		if [ -d "/sys/class/net/$INTERFACE" ] ; then
+			owner=`cat /sys/class/net/$INTERFACE/owner 2>/dev/null`
+			group=`cat /sys/class/net/$INTERFACE/group 2>/dev/null`
+			debug "Tunnel interface $INTERFACE exists ($owner:$group)"
+			info="Already exists"
+			if [ -n "$owner" ] ; then
+				info="$info, owned by uid $owner"
+			fi
+			if [ "x$group" != "x-1" ] ; then
+				info="$info, gid $group"
+			fi
+			printf "    %-9s %s\n" "$INTERFACE" "$info"
+		elif [ "$TUNNEL_SET_PERSISTENT" != no ] ; then
+			# we use a persistent tunnel by default
 			case "$INTERFACETYPE" in
 			tap)	TUNCTL_TYPE_ARG="-p" ;;
 			tun)	TUNCTL_TYPE_ARG="-n" ;;
-- 
1.6.4.2

From 7ecc238aa0da2393ce62704d983c9ebdbcf2771d Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.de>
Date: Wed, 20 Jan 2010 21:31:38 +0100
Subject: [PATCH] Don't display tun/tap gid when not provided via sysfs (bnc#557864).

---
 scripts/ifup-tunnel |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/ifup-tunnel b/scripts/ifup-tunnel
index 295af49..43b0c6b 100755
--- a/scripts/ifup-tunnel
+++ b/scripts/ifup-tunnel
@@ -260,7 +260,7 @@ up)
 			if [ -n "$owner" ] ; then
 				info="$info, owned by uid $owner"
 			fi
-			if [ "x$group" != "x-1" ] ; then
+			if [ -n "$group" -a "x$group" != "x-1" ] ; then
 				info="$info, gid $group"
 			fi
 			printf "    %-9s %s\n" "$INTERFACE" "$info"
-- 
1.6.4.2

Places

File sysconfig-ifup-tunnel-allow-existing-tap.bnc557864.diff of Package sysconfig

Places