From 27a1eb2e1d692cf1fd430ec73319b9a6eb0b193f Mon Sep 17 00:00:00 2001
From: UnicronNL <UnicronNL@users.noreply.github.com>
Date: Sat, 23 Aug 2014 13:45:47 +0200
Subject: Always allow gre-multipoint

---
 scripts/vyatta-encapsulation | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'scripts/vyatta-encapsulation')

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})"
-- 
cgit v1.2.3