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

diff --git a/teardown-egre-link b/teardown-egre-link
index 77cc1d1..5de8447 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
-ip tunnel del $EGRE
+# Get rid of EGRE tunnel and MACVLAN interface
+ip link del $EGRE