From bcba0452f09f21eb0b3c13ab2fa3af4921fe1822 Mon Sep 17 00:00:00 2001
From: Kim Hagen <khagen@multi-development.com>
Date: Wed, 10 Sep 2014 16:43:10 +0200
Subject: Remove gre-multipoint reference

---
 scripts/vyos-update-nhrp.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/vyos-update-nhrp.pl b/scripts/vyos-update-nhrp.pl
index b2b6a7e..9b28c63 100644
--- a/scripts/vyos-update-nhrp.pl
+++ b/scripts/vyos-update-nhrp.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perlcd 
 #
 # Module: vyos-update-nhrp.pl
 #
@@ -105,7 +105,7 @@ sub configure_nhrp_tunnels {
 	if (@nhrp_tunnels) {
 		foreach my $nhrp_tunnel(@nhrp_tunnels) {
 			if ($nhrp_tunnel ~~ @tunnels) {
-				if ($config_tun->returnValue("$nhrp_tunnel encapsulation") eq "gre-multipoint") {
+				if ($config_tun->returnValue("$nhrp_tunnel encapsulation") eq "gre" && $config_tun->returnValue("$nhrp_tunnel remote-ip") eq "") {
 					my @conf_file = tunnel_config($nhrp_tunnel);
 					open (my $fh,">>$conffile");
 					foreach (@conf_file) {
@@ -115,7 +115,7 @@ sub configure_nhrp_tunnels {
 					$notun = 1;
 				}
 				else {
-					print ("Tunnel $nhrp_tunnel is not configured for 'gre-multipoint'\n");
+					print ("$nhrp_tunnel is not 'mGRE' tunnel'\n");
 					exit 1;
 				}
 			}
-- 
cgit v1.2.3