From d7b033bb5576b497c84a73bfc8a852614f9821b9 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Wed, 25 May 2011 11:49:47 -0700
Subject: alternative fix for bug 6958

---
 scripts/vyatta-tunnel-cleanup        | 8 ++++++--
 templates/interfaces/tunnel/node.def | 9 +++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/vyatta-tunnel-cleanup b/scripts/vyatta-tunnel-cleanup
index 6094818c..979fb7bd 100755
--- a/scripts/vyatta-tunnel-cleanup
+++ b/scripts/vyatta-tunnel-cleanup
@@ -15,13 +15,17 @@ my %encapsulation = (
     'sit'  => 'sit',
 );
 
+# interface being deleted
+my $interface = $ARGV[0];
+
 # Create map of encapsulations still in use
 my $config = new Vyatta::Config;
 $config->setLevel("interfaces tunnel");
 
 my %tunnel;
-foreach my $tun ( $config->listNodes() ) {
-    my $mode = $config->returnValue("$tun encapsulation");
+foreach my $tun ( $config->listEffectiveNodes() ) {
+    my $mode = $config->returnEffectiveValue("$tun encapsulation");
+    next if ($interface eq $tun); # don't count the one being deleted
     $tunnel{$mode} = 1;
 }
 
diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def
index c8670a16..669f7636 100644
--- a/templates/interfaces/tunnel/node.def
+++ b/templates/interfaces/tunnel/node.def
@@ -40,10 +40,7 @@ delete: ip link set $VAR(@) down
           ip tunnel del $VAR(@) mode $VAR(./encapsulation/@)
         fi
 
-end: if  [ "$COMMIT_SIBLING_POSITION" = "LAST" ] || \
-         [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then  
-       if [ ${COMMIT_ACTION} = "DELETE" ]; then 
-          /opt/vyatta/sbin/vyatta-tunnel-cleanup
-       fi
-    fi
+end: if [ "${COMMIT_ACTION}" == DELETE ]; then
+       /opt/vyatta/sbin/vyatta-tunnel-cleanup $VAR(@)
+     fi
 
-- 
cgit v1.2.3