need full path to linkdetect

10 files changed, 20 insertions, 19 deletions

diff --git a/Makefile.am b/Makefile.am
index d0dd7885..b9b5af3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,9 @@ 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 acb7d272..d426dfd2 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-wanloadbalance.pl
+# Module: vyatta-policy-action-verify.pl
 # 
 # **** License ****
 # This program is free software; you can redistribute it and/or modify
@@ -16,10 +16,6 @@
 # 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 22eec7cf..83858ec1 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:vyatta-link-detect $VAR(../@) on
-delete:vyatta-link-detect $VAR(../@) off
+update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
+delete:/opt/vyatta/sbin/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 97a74ccc..92222182 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:vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
-delete:vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
+update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
+delete:/opt/vyatta/sbin/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 4cd557d9..5d72bf2b 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:vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
-delete:vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
+update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
+delete:/opt/vyatta/sbin/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 7992791f..907db627 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:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
+update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
+delete:/opt/vyatta/sbin/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 03317ea1..e0c0b3a7 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: vyatta-link-detect $VAR(../@) off
-delete: vyatta-link-detect $VAR(../@) on
+update: /opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
+delete: /opt/vyatta/sbin/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 7992791f..907db627 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:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
+update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
+delete:/opt/vyatta/sbin/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 94c73270..eecd80ba 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:vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
+update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
+delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
diff --git a/templates/protocols/node.def b/templates/protocols/node.def
index 04e1666a..a976ef1e 100644
--- a/templates/protocols/node.def
+++ b/templates/protocols/node.def
@@ -1 +1,3 @@
 help: Configure routing protocol parameters
+begin: vyatta-routing-daemons.pl --begin-update
+end: vyatta-routing-daemons.pl --end-update