diff options
| author | UnicronNL <UnicronNL@users.noreply.github.com> | 2014-08-23 13:45:47 +0200 |
|---|---|---|
| committer | UnicronNL <UnicronNL@users.noreply.github.com> | 2014-08-23 13:45:47 +0200 |
| commit | 27a1eb2e1d692cf1fd430ec73319b9a6eb0b193f (patch) | |
| tree | ad9471e6aa07173e7ab7b0c0144ad6a29c459856 | |
| parent | 2bffe70cdb9b9eb31e54b85bbccf8d090c80de93 (diff) | |
| download | vyatta-cfg-system-27a1eb2e1d692cf1fd430ec73319b9a6eb0b193f.tar.gz vyatta-cfg-system-27a1eb2e1d692cf1fd430ec73319b9a6eb0b193f.zip | |
Always allow gre-multipoint
| -rw-r--r-- | scripts/vyatta-encapsulation | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/vyatta-encapsulation b/scripts/vyatta-encapsulation index 8c64341e..f1cae8b1 100644 --- a/scripts/vyatta-encapsulation +++ b/scripts/vyatta-encapsulation @@ -1,8 +1,7 @@ #!/bin/sh -list="gre gre-bridge ipip sit ipip6 ip6ip6" -if [[ `dpkg -l | grep "vyatta-nhrp" | awk '{print $1}'` = "ii" ]]; then tmp="gre-multipoint"; fi -full_list="${list} ${tmp}" +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})" |