summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/vyatta-encapsulation11
-rwxr-xr-xscripts/vyatta-tunnel-cleanup3
2 files changed, 0 insertions, 14 deletions
diff --git a/scripts/vyatta-encapsulation b/scripts/vyatta-encapsulation
deleted file mode 100644
index f1cae8b1..00000000
--- a/scripts/vyatta-encapsulation
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-list="gre gre-bridge gre-multipoint ipip sit ipip6 ip6ip6"
-full_list="${list}"
-if [[ -n "$1" ]]; then
- for f in ${full_list}; do if [[ "$1" = "$f" ]]; then exit 0; fi; done
- echo "Must be (${full_list})"
- exit 1;
-else
- echo ${full_list}
-fi
diff --git a/scripts/vyatta-tunnel-cleanup b/scripts/vyatta-tunnel-cleanup
index af73bc04..979fb7bd 100755
--- a/scripts/vyatta-tunnel-cleanup
+++ b/scripts/vyatta-tunnel-cleanup
@@ -26,9 +26,6 @@ my %tunnel;
foreach my $tun ( $config->listEffectiveNodes() ) {
my $mode = $config->returnEffectiveValue("$tun encapsulation");
next if ($interface eq $tun); # don't count the one being deleted
- if ($mode eq "gre-multipoint") {
- $mode = "gre";
- }
$tunnel{$mode} = 1;
}