T1026: Removing tunnel deletes all tunnels?

zdc · Jan 7, 2019 · 68cd1f0 · 68cd1f0
1 parent ac028c3
commit 68cd1f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,15 @@
+vyatta-cfg-system (0.20.44+vyos2+current17) unstable; urgency=low
+
+  * T1026 - Removing tunnel deletes all tunnels?
+
+ -- hagbard <[email protected]>  Mon, 07 Jan 2019 14:24:33 -0800
+
 vyatta-cfg-system (0.20.44+vyos2+current16) unstable; urgency=low
 
   * T1053 - Error when re-configuring an interface from DHCP to static IP
 
  -- hagbard <[email protected]>  Thu, 29 Nov 2018 14:26:07 -0800
+
 vyatta-cfg-system (0.20.44+vyos2+current15) unstable; urgency=medium
 
   * Virtio network card, no info (maybe not fully supported?)

diff --git a/scripts/vyatta-tunnel-cleanup b/scripts/vyatta-tunnel-cleanup
@@ -28,13 +28,3 @@ foreach my $tun ( $config->listEffectiveNodes() ) {
     next if ($interface eq $tun); # don't count the one being deleted
     $tunnel{$mode} = 1;
 }
-
-foreach my $type ( keys %encapsulation ) {
-    # skip if tunnel is still in use
-    next if $tunnel{$type};
-
-    my $module = $encapsulation{$type};
-    next unless ( -d "/sys/module/$module" );
-    system("sudo /sbin/rmmod $module") == 0
-	or warn "rmmod $module failed\n";
-}