X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=teardown-egre-link;h=46debc18cb6b6434036913c26be9ef70e1af8b88;hb=8b07d3cdcc4cbe4eadc0a06175912666c9775d6d;hp=77cc1d1ec68173667e63be4e796a7203c5475cc7;hpb=e4d85917a4dc6fe4cd3dd55abb8eb1f957468d15;p=nodemanager-topo.git

diff --git a/teardown-egre-link b/teardown-egre-link
index 77cc1d1..46debc1 100755
--- a/teardown-egre-link
+++ b/teardown-egre-link
@@ -1,25 +1,11 @@
 #!/bin/sh +x
 
-SLICE=$1
-SLICEID=`id -u $SLICE`
-NODEID=$2
-KEY=$3
+NODEID=$1
+KEY=$2
 
 LINK=${KEY}x${NODEID}
 EGRE=d$LINK
-BRIDGE=c$LINK
-ETUN1=b$LINK
 
-# Remove iptables rule
-iptables -t mangle -D FORWARD -o $BRIDGE -j MARK --set-mark $SLICEID
-
-# Get rid of etun devices, only need name of one of them
-echo $ETUN1 > /sys/module/etun/parameters/delif
-
-# Get rid of bridge
-ifconfig $BRIDGE down
-brctl delbr $BRIDGE
-
-# Get rid of EGRE tunnel
+# Get rid of EGRE tunnel and MACVLAN interface
 ip tunnel del $EGRE