From 0579f8e2d42a3468d335823344b1995fd1515aff Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 28 Jul 2008 12:54:40 -0700
Subject: Use vyatta_sbindir

Wrong shell variable in earlier commit
---
 templates/protocols/bgp/node.tag/aggregate-address/node.def             | 2 +-
 templates/protocols/bgp/node.tag/network/node.def                       | 2 +-
 templates/protocols/ospf/area/node.tag/network/node.def                 | 2 +-
 templates/protocols/ospf/area/node.tag/range/node.def                   | 2 +-
 .../protocols/ospf/area/node.tag/range/node.tag/substitute/node.def     | 2 +-
 templates/protocols/rip/network-distance/node.def                       | 2 +-
 templates/protocols/rip/network/node.def                                | 2 +-
 templates/protocols/rip/route/node.def                                  | 2 +-
 templates/protocols/static/interface-route/node.def                     | 2 +-
 templates/protocols/static/interface-route6/node.def                    | 2 +-
 templates/protocols/static/route/node.def                               | 2 +-
 templates/protocols/static/route6/node.def                              | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.def b/templates/protocols/bgp/node.tag/aggregate-address/node.def
index 4f2c63bc..9d834276 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/aggregate-address/node.def
@@ -2,7 +2,7 @@ tag:
 type: ipv4net
 help: Set a BGP aggregate network
 comp_help: \1 <x.x.x.x/x>\taggregate network
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID 
 end:  ${vyatta_sbindir}/vyatta-vtysh.pl -noerr \
        -c "configure terminal" \
diff --git a/templates/protocols/bgp/node.tag/network/node.def b/templates/protocols/bgp/node.tag/network/node.def
index 43585bc5..5a5f1164 100644
--- a/templates/protocols/bgp/node.tag/network/node.def
+++ b/templates/protocols/bgp/node.tag/network/node.def
@@ -2,7 +2,7 @@ tag:
 type: ipv4net
 help: Set a BGP network
 comp_help: \1  <x.x.x.x/x>\tnetwork
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 commit:expression: !($VAR(./backdoor/) != "" && $VAR(./route-map/) != "");
        "protocols bgp $VAR(../@) network $VAR(@): May specify route-map or backdoor but not both"
 delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
index 8a5173f4..33369ffd 100644
--- a/templates/protocols/ospf/area/node.tag/network/node.def
+++ b/templates/protocols/ospf/area/node.tag/network/node.def
@@ -2,7 +2,7 @@ multi:
 type: ipv4net
 help: Set OSPF network
 priority: 1
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"network $VAR(@) area $VAR(../@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def
index 8293a1e5..10a92bde 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv4net
 help: Set to summarize routes matching prefix (border routers only)
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 
 delete: touch /tmp/ospf-range.$PPID
 
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
index ceb6ff7f..ab3b85ba 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
@@ -1,3 +1,3 @@
 type: ipv4net
 help: Set to announce area range as another prefix
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
diff --git a/templates/protocols/rip/network-distance/node.def b/templates/protocols/rip/network-distance/node.def
index bb8a483e..5df95012 100644
--- a/templates/protocols/rip/network-distance/node.def
+++ b/templates/protocols/rip/network-distance/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv4net
 help: Set source network
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 commit:expression: $VAR(./distance/) != ""; "Must specify distance for network $VAR(@)"
 delete:expression: "touch /tmp/rip-dist.$PPID"
 end:expression: "if [ -n \"$VAR(./access-list/@)\" ]; then \
diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def
index 4fd37c09..072de165 100644
--- a/templates/protocols/rip/network/node.def
+++ b/templates/protocols/rip/network/node.def
@@ -1,7 +1,7 @@
 multi:
 type: ipv4net
 help: Set RIP network
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"network $VAR(@)\"; "
 delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
diff --git a/templates/protocols/rip/route/node.def b/templates/protocols/rip/route/node.def
index 067b8fc1..e2496ae2 100644
--- a/templates/protocols/rip/route/node.def
+++ b/templates/protocols/rip/route/node.def
@@ -1,7 +1,7 @@
 multi:
 type: ipv4net
 help: Set RIP static route
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
          -c \"route $VAR(@)\" "
 delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
diff --git a/templates/protocols/static/interface-route/node.def b/templates/protocols/static/interface-route/node.def
index 5317a93c..a30f4dac 100644
--- a/templates/protocols/static/interface-route/node.def
+++ b/templates/protocols/static/interface-route/node.def
@@ -1,4 +1,4 @@
 tag:
 type: ipv4net
 help: Set an interface-based static route
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
diff --git a/templates/protocols/static/interface-route6/node.def b/templates/protocols/static/interface-route6/node.def
index 1f2f561a..4048960a 100644
--- a/templates/protocols/static/interface-route6/node.def
+++ b/templates/protocols/static/interface-route6/node.def
@@ -1,4 +1,4 @@
 tag:
 type: ipv6net
 help: Set an interface-based IPv6 static route
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
diff --git a/templates/protocols/static/route/node.def b/templates/protocols/static/route/node.def
index 9f5eb0db..74cf3715 100644
--- a/templates/protocols/static/route/node.def
+++ b/templates/protocols/static/route/node.def
@@ -1,4 +1,4 @@
 tag:
 type: ipv4net
 help: Set a static route
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
diff --git a/templates/protocols/static/route6/node.def b/templates/protocols/static/route6/node.def
index 86ca5826..0be98812 100644
--- a/templates/protocols/static/route6/node.def
+++ b/templates/protocols/static/route6/node.def
@@ -1,4 +1,4 @@
 tag:
 type: ipv6net
 help: Set a static IPv6 route
-syntax:expression: exec "${sbin_dir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-- 
cgit v1.2.3