diff options
| author | hagbard <vyosdev@derith.de> | 2019-01-07 15:04:28 -0800 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-01-07 15:04:28 -0800 |
| commit | 68cd1f0cd55bfe76a44f552fd04e4019539a3a99 (patch) | |
| tree | 5ccc7e4cd7ca3d2ee8492f1d7a3b4829565d8141 | |
| parent | ac028c3cfa2da488fd4cf989e0889a3416183e9b (diff) | |
| download | vyatta-cfg-system-68cd1f0cd55bfe76a44f552fd04e4019539a3a99.tar.gz vyatta-cfg-system-68cd1f0cd55bfe76a44f552fd04e4019539a3a99.zip | |
T1026: Removing tunnel deletes all tunnels?
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | scripts/vyatta-tunnel-cleanup | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 1f14c36e..bfe81527 100644 --- 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 <vyosdev@derith.de> 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 <vyosdev@derith.de> 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 index 979fb7bd..b8a93244 100755 --- 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"; -} |