Revert "need full path to linkdetect"

This reverts commit d4952bc1550223dddcd1228d7335ce1fc380f739 because it
included local changes as well as bug fix

10 files changed, 19 insertions, 20 deletions

diff --git a/Makefile.am b/Makefile.am
index b9b5af3a..d0dd7885 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,6 @@ sbin_SCRIPTS += scripts/vyatta-policy-action-verify.pl
 sbin_SCRIPTS += scripts/vyatta-gateway-static_route-check.pl
 sbin_SCRIPTS += scripts/vyatta-link-detect
 
-share_perl5dir = /opt/vyatta/share/perl5/Vyatta/Quagga
-share_perl5_data = lib/Vyatta/Quagga/Daemons.pm
-
 sbin_PROGRAMS = src/check_prefix_boundary
 
 src_check_prefix_boundary = src/check_prefix_boundary.c
diff --git a/scripts/vyatta-policy-action-verify.pl b/scripts/vyatta-policy-action-verify.pl
index d426dfd2..acb7d272 100644
--- a/scripts/vyatta-policy-action-verify.pl
+++ b/scripts/vyatta-policy-action-verify.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Module: vyatta-policy-action-verify.pl
+# Module: vyatta-wanloadbalance.pl
 # 
 # **** License ****
 # This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,10 @@
 # Portions created by Vyatta are Copyright (C) 2008 Vyatta, Inc.
 # All Rights Reserved.
 # 
+# Author: Michael Larson
+# Date: January 2008
+# Description: Writes exclusion list for linkstatus
+# 
 # **** End License ****
 #
 use lib "/opt/vyatta/share/perl5/";
diff --git a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
index 83858ec1..22eec7cf 100644
--- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
 help: Set to ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
-delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
+update:vyatta-link-detect $VAR(../@) on
+delete:vyatta-link-detect $VAR(../@) off
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
index 92222182..97a74ccc 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
 help: Set to ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
+update:vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
+delete:vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
diff --git a/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def
index 5d72bf2b..4cd557d9 100644
--- a/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
 help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
+update:vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
+delete:vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
index 907db627..7992791f 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
 help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
+update:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
+delete:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
diff --git a/templates/interfaces/serial/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/disable-link-detect/node.def
index e0c0b3a7..03317ea1 100644
--- a/templates/interfaces/serial/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
 help: ignore link state changes on this interface
-update: /opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
-delete: /opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
+update: vyatta-link-detect $VAR(../@) off
+delete: vyatta-link-detect $VAR(../@) on
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
index 907db627..7992791f 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
 help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
+update:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
+delete:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
index eecd80ba..94c73270 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
 help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
+update:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
+delete:vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
diff --git a/templates/protocols/node.def b/templates/protocols/node.def
index a976ef1e..04e1666a 100644
--- a/templates/protocols/node.def
+++ b/templates/protocols/node.def
@@ -1,3 +1 @@
 help: Configure routing protocol parameters
-begin: vyatta-routing-daemons.pl --begin-update
-end: vyatta-routing-daemons.pl --end-update