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

diff --git a/teardown-egre-link b/teardown-egre-link
index 77cc1d1..a0d5e5b 100755
--- a/teardown-egre-link
+++ b/teardown-egre-link
@@ -1,20 +1,22 @@
 #!/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
+MARK=`iptables -t mangle -L -v|grep -m 1 $BRIDGE|awk '{print $NF}'`
+
+# Remove iptables rules.  Sometimes there is more than one.
+while [ $? -eq 0 ]; do
+    iptables -t mangle -D FORWARD -o $BRIDGE -j MARK --set-mark $MARK
+done
 
 # Get rid of etun devices, only need name of one of them
-echo $ETUN1 > /sys/module/etun/parameters/delif
+ip link delete dev $ETUN1 
 
 # Get rid of bridge
 ifconfig $BRIDGE down