diff options
| author | Kim Hagen <khagen@multi-development.com> | 2014-09-10 16:13:55 +0200 |
|---|---|---|
| committer | Kim Hagen <khagen@multi-development.com> | 2014-09-10 16:13:55 +0200 |
| commit | 2dc5f65235d321b071ed4a6811de64f8c036ba66 (patch) | |
| tree | de4dd2c1c76ae363264e99041a20b5d95196e1bd /scripts | |
| parent | cffeb5c8d05a996049e487a75f06b4cdd68b23ae (diff) | |
| download | vyatta-cfg-system-2dc5f65235d321b071ed4a6811de64f8c036ba66.tar.gz vyatta-cfg-system-2dc5f65235d321b071ed4a6811de64f8c036ba66.zip | |
Remove gre-multipoint encapsulation option, make the tunnel multipoint if 'remote-ip' is nowt set.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/vyatta-encapsulation | 11 | ||||
| -rwxr-xr-x | scripts/vyatta-tunnel-cleanup | 3 |
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; } |