Add wrapper script between cfg templates and vtysh. The wrapper will:

- log commands to /tmp/vtysh.log
- return error code when quagga responds with an errmsg
- ignore errors when called with -n

54 files changed, 110 insertions, 110 deletions

diff --git a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
index 349d90fb..784d2b4a 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
@@ -2,7 +2,7 @@ help: "Normal OSPF area"
 syntax: $(../stub/) == "" ; "Must delete stub area type first"
 syntax: $(../nssa/) == "" ; "Must delete nssa area type first"
 create: "if [ x$(../../@) != x0.0.0.0 ] && [ x$(../../@) != x0 ]; then \
-            /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
             -c \"no area $(../../@) stub\" -c \"no area $(../../@) nssa\"; \
          fi; "
 
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
index e24f89ea..f3851e46 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Set the summary-default cost of nssa area"
 syntax: $(@) >= 0 && $(@) <= 16777215; "Cost must be between 0-16777215"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../../@) default-cost $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../../@) default-cost $(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
index ca18ee14..1b149db4 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
@@ -1,5 +1,5 @@
 help: "Do not inject inter-area routes into stub"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../../@) nssa no-summary \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../../@) nssa no-summary \"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
index 8ecc9880..75cb20a8 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
@@ -2,7 +2,7 @@ help: "nssa OSPF area"
 syntax: ! $(../../@) in "0", "0.0.0.0"; "Backbone can't be NSSA"
 syntax: $(../normal/) == "" ; "Must delete normal area type first"
 syntax: $(../stub/) == "" ; "Must delete stub area type first"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" -c \"area $(../../@) nssa\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" -c \"no area $(../../@) nssa\"; "
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"area $(../../@) nssa\"; "
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no area $(../../@) nssa\"; "
 
 
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
index c0d19663..8c4d9f81 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
@@ -1,7 +1,7 @@
 type: txt
 default: "candidate"
 syntax: $(@) in "always", "candidate", "never"; "Must be (always, candidate, or never)"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"area $(../../../@) nssa translate-$(@) \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"no area $(../../../@) nssa translate-$(@) \"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
index b4ea0de7..6d82250d 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Set the summary-default cost of stub area"
 syntax: $(@) >= 0 && $(@) <= 16777215; "Cost must be between 0-16777215"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../../@) default-cost $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../../@) default-cost $(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
index 84299b62..750e6311 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
@@ -1,5 +1,5 @@
 help: "Do not inject inter-area routes into stub"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../../@) stub no-summary \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../../@) stub no-summary \"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
index 4a783e80..1e975ff3 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
@@ -2,7 +2,7 @@ help: "Stub OSPF area"
 syntax: ! $(../../@) in "0", "0.0.0.0"; "Backbone can't be stub"
 syntax: $(../nssa/) == "" ; "Must delete nssa area type first"
 syntax: $(../normal/) == "" ; "Must delete normal area type first"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"area $(../../@) stub\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"no area $(../../@) stub\"; "
diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def
index 2a55767d..f30c1c9a 100644
--- a/templates/protocols/ospf/area/node.tag/authentication/node.def
+++ b/templates/protocols/ospf/area/node.tag/authentication/node.def
@@ -2,16 +2,16 @@ type: txt
 help: "Configure OSPF area authentication type"
 syntax: $(@) in "simple", "md5"; "Must be either simple or md5"
 update: "if [ x$(@) == xsimple ]; then                          \
-           /usr/bin/vtysh -c \"configure terminal\"             \
+           \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"             \
             -c \"router ospf \"                                 \
             -c \"no area $(../@) authentication \"              \
             -c \"area $(../@) authentication \" ;               \
          else                                                   \
-           /usr/bin/vtysh -c \"configure terminal\"             \
+           \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"             \
             -c \"router ospf \"                                 \
             -c \"no area $(../@) authentication \"              \ 
             -c \"area $(../@) authentication message-digest\" ; \
          fi; "
-delete: "/usr/bin/vtysh -c \"configure terminal\"               \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"               \
             -c \"router ospf \"                                 \
             -c \"no area $(../@) authentication \" "
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
index 2ac292d3..9d345218 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: "OSPF network"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"network $(@) area $(../@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no network $(@) area $(../@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def
index 37b7a5bb..b2b998e9 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.def
@@ -2,7 +2,7 @@ tag:
 type: ipv4net
 help: "Summarize routes matching prefix (border routers only)"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../@) range $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../@) range $(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
index 8403c1a5..46478b26 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Metric for this range"
 syntax: $(@) >= 0 && $(@) <= 16777215; "Metric must be between 0-16777215"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"area $(../../@) range $(../@) cost $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no area $(../../@) range $(../@) cost $(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
index 1893ecc7..cf56efe4 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
@@ -1,5 +1,5 @@
 help: "Do NOT advertise this range"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../@) range $(../@) not-advertise\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../@) range $(../@) not-advertise\"; "
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 722e7b7e..9b1243b4 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,7 +1,7 @@
 type: ipv4net
 help: "Announce area range as another prefix"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../@) range $(../@) substitute $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../@) range $(../@) substitute $(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def
index a94f758b..975d8563 100644
--- a/templates/protocols/ospf/area/node.tag/shortcut/node.def
+++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: "Configure area's shortcutting mode"
 syntax: $(@) in "default", "disable", "enable"; "Must be (default, disable, enable)"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../@) shortcut $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../@) shortcut $(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
index ba483ff7..8f305002 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
@@ -2,7 +2,7 @@ tag:
 type: ipv4
 help: "Configure a virtual link"
 syntax: ! $(../@) in "0", "0.0.0.0"; "Can't configure VL over area $(../@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../@) virtual-link $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../@) virtual-link $(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
index 43524391..5bb35317 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
@@ -5,11 +5,11 @@ syntax: $(@) >= 1 && $(@) <= 255; "ID must be between (1-255)"
 commit: $(md5-key/) != ""; "must add the md5-key for key-id $(@)"
 delete: "touch /tmp/ospf-md5.\\$PPID"
 end: "if [ -f \"/tmp/ospf-md5.\\$PPID\" ]; then \
-         /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../../../@) virtual-link $(../../../@) message-digest-key $(@)\"; \
          rm /tmp/ospf-md5.\\$PPID; \
       else \
-         /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../../../@) virtual-link $(../../../@) message-digest-key $(@) md5 $(md5-key/@)\"; \
       fi; "
 
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
index f4d63a02..aaf79ced 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
@@ -1,6 +1,6 @@
 help: "Configure MD5 key id"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
       -c \"no area $(../../../@) virtual-link $(../../@) authentication-key\" \
       -c \"area $(../../../@) virtual-link $(../../@) authentication message-digest\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
       -c \"area $(../../../@) virtual-link $(../../@) authentication null\"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def
index 3a3df6b5..253572a3 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: "Configure simple password"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../../@) virtual-link $(../../@) authentication authentication-key $(@) \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../../@) virtual-link $(../../@) authentication authentication-key \"; "
 
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
index c3f04081..7e66e018 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Interval after which a neighbor is declared dead"
 syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../@) virtual-link $(../@) dead-interval $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../@) virtual-link $(../@) dead-interval \"; "
 #comp_help: <1-65535> Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
index 3c28b6f7..dc63aad8 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Interval between HELLO packets"
 syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../@) virtual-link $(../@) hello-interval $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../@) virtual-link $(../@) hello-interval \"; "
 #comp_help: <1-65535> Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
index 67b453d4..2edda12f 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Interval between retransmitting lost link state advertisements"
 syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../@) virtual-link $(../@) retransmit-interval $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../@) virtual-link $(../@) retransmit-interval \"; "
 #comp_help: <1-65535> Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
index dc16966a..9dc9a8d2 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Link state transmit delay"
 syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"area $(../../@) virtual-link $(../@) transmit-delay $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no area $(../../@) virtual-link $(../@) transmit-delay \"; "
 #comp_help: <1-65535> Seconds
diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
index 6fc9076f..b5a97e7b 100644
--- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
+++ b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
@@ -1,5 +1,5 @@
 type: u32
 help: "Use reference bandwidth method to assign OSPF cost in Mbits/sec"
 syntax: $(@) >= 1 && $(@) <= 4294967; "Must be between 1-4294967"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" -c \"auto-cost reference-bandwidth $(@) \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" -c \"no auto-cost reference-bandwidth \"; "
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"auto-cost reference-bandwidth $(@) \"; "
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no auto-cost reference-bandwidth \"; "
diff --git a/templates/protocols/ospf/capability/opaque/node.def b/templates/protocols/ospf/capability/opaque/node.def
index 4746d475..5dfed2af 100644
--- a/templates/protocols/ospf/capability/opaque/node.def
+++ b/templates/protocols/ospf/capability/opaque/node.def
@@ -1,3 +1,3 @@
 help: "Opaque LSA"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" -c \"capability opaque\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" -c \"no capability opaque\"; "
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"capability opaque\"; "
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" -c \"no capability opaque\"; "
diff --git a/templates/protocols/ospf/compatible/rfc1583/node.def b/templates/protocols/ospf/compatible/rfc1583/node.def
index 7654d4b2..e896c274 100644
--- a/templates/protocols/ospf/compatible/rfc1583/node.def
+++ b/templates/protocols/ospf/compatible/rfc1583/node.def
@@ -1,5 +1,5 @@
 help: "compatible with RFC 1583"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"compatible rfc1583\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no compatible rfc1583\"; "
diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def
index 017473c2..5772bdcb 100644
--- a/templates/protocols/ospf/default-information/originate/node.def
+++ b/templates/protocols/ospf/default-information/originate/node.def
@@ -1,7 +1,7 @@
 help: "Distribute a default route"
 delete: "touch /tmp/ospf-default-info.\\$PPID"
 end: "if [ -f \"/tmp/ospf-default-info.\\$PPID\" ]; then \
-         /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"no default-information originate \"; \
       else \
          if [ -n \"$(./always/@)\" ]; then \
@@ -16,6 +16,6 @@ end: "if [ -f \"/tmp/ospf-default-info.\\$PPID\" ]; then \
          if [ -n \"$(./route-map/@)\" ]; then \
            PARM=\"\\$PARM route-map $(./route-map/@)\"; \
          fi; \
-         /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"default-information originate \\$PARM\"; \
       fi; "
diff --git a/templates/protocols/ospf/default-metric/node.def b/templates/protocols/ospf/default-metric/node.def
index 90fba236..f147d611 100644
--- a/templates/protocols/ospf/default-metric/node.def
+++ b/templates/protocols/ospf/default-metric/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Set metric of redistributed routes"
 syntax: $(@) >= 0 && $(@) <= 16777214; "Must be between 0-16777214"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"default-metric $(@) \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no default-metric $(@) \"; "
diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def
index 6b45a976..d88a761b 100644
--- a/templates/protocols/ospf/distance/global/node.def
+++ b/templates/protocols/ospf/distance/global/node.def
@@ -1,9 +1,9 @@
 type: u32
 help: "OSPF administrative distance"
 syntax: $(@) >= 1 && $(@) <= 255; "Must be between 1-255"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"distance $(@) \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"no distance $(@) \"; "
 
 
diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def
index cd64dd88..fa49eaa1 100644
--- a/templates/protocols/ospf/distance/ospf/node.def
+++ b/templates/protocols/ospf/distance/ospf/node.def
@@ -1,7 +1,7 @@
 help: "OSPF administrative distance"
 delete: "touch /tmp/ospf-distance.\\$PPID"
 end: "if [ -f \"/tmp/ospf-distance.\\$PPID\" ]; then \
-         /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"no distance ospf\"; \
 	 rm /tmp/ospf-distance.\\$PPID; \
       else \
@@ -14,6 +14,6 @@ end: "if [ -f \"/tmp/ospf-distance.\\$PPID\" ]; then \
          if [ -n \"$(./external/@)\" ]; then \
            PARM=\"\\$PARM external $(./external/@)\"; \
          fi; \
-         /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"no distance ospf\" -c \"distance ospf \\$PARM\"; \
       fi; "
diff --git a/templates/protocols/ospf/distribute-list/node.tag/out/node.def b/templates/protocols/ospf/distribute-list/node.tag/out/node.def
index ce310b0a..cd2f1200 100644
--- a/templates/protocols/ospf/distribute-list/node.tag/out/node.def
+++ b/templates/protocols/ospf/distribute-list/node.tag/out/node.def
@@ -2,7 +2,7 @@ multi:
 type: txt
 help: "Filter outgoing routing updates"
 syntax: $(@) in "bgp", "connected", "isis", "kernel", "rip", "static"; "Must be (bgp, connected, isis, kernel, rip, or static"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
             -c \"distribute-list $(../@) out $(@) \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
             -c \"no distribute-list $(../@) out $(@) \"; "
diff --git a/templates/protocols/ospf/log-adjacency-changes/detail/node.def b/templates/protocols/ospf/log-adjacency-changes/detail/node.def
index 9ec797d7..cffc4455 100644
--- a/templates/protocols/ospf/log-adjacency-changes/detail/node.def
+++ b/templates/protocols/ospf/log-adjacency-changes/detail/node.def
@@ -1,6 +1,6 @@
 help: "Log all state changes"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"log-adjacency-changes detail\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"no log-adjacency-changes detail\"; "
 
diff --git a/templates/protocols/ospf/log-adjacency-changes/node.def b/templates/protocols/ospf/log-adjacency-changes/node.def
index f33fe807..0c07be4a 100644
--- a/templates/protocols/ospf/log-adjacency-changes/node.def
+++ b/templates/protocols/ospf/log-adjacency-changes/node.def
@@ -1,5 +1,5 @@
 help: "Log changes in adjacency state"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"log-adjacency-changes\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"no log-adjacency-changes\"; "
diff --git a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
index a209a7a9..0f7c2ba6 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
@@ -1,7 +1,7 @@
 help: "Administratively applied, for an indefinite period"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"max-metric router-lsa administrative\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no max-metric router-lsa administrative \"; "
 
 
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
index 8f8343a5..55a08828 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Advertise stub-router prior to full shutdown of OSPF"
 syntax: $(@) >= 5 && $(@) <= 86400; "must be between 5-86400 seconds"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"max-metric router-lsa on-shutdown $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no max-metric router-lsa on-shutdown \"; "
 #comp_help: Time (seconds) to advertise self as stub-router"
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
index 1f7603ec..f9c9432d 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
@@ -1,9 +1,9 @@
 type: u32
 help: "Automatically advertise stub Router-LSA on startup of OSPF"
 syntax: $(@) >= 5 && $(@) <= 86400; "must be between 5-86400 seconds"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"max-metric router-lsa on-startup $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no max-metric router-lsa on-startup \"; "
 #comp_help: Time (seconds) to advertise self as stub-router"
 
diff --git a/templates/protocols/ospf/mpls-te/enable/node.def b/templates/protocols/ospf/mpls-te/enable/node.def
index f1401956..22804817 100644
--- a/templates/protocols/ospf/mpls-te/enable/node.def
+++ b/templates/protocols/ospf/mpls-te/enable/node.def
@@ -1,5 +1,5 @@
 help: "Enable the MPLS-TE functionality"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"mpls-te on\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no mpls-te\"; "
diff --git a/templates/protocols/ospf/mpls-te/router-address/node.def b/templates/protocols/ospf/mpls-te/router-address/node.def
index 4102dfd1..6a0fdfee 100644
--- a/templates/protocols/ospf/mpls-te/router-address/node.def
+++ b/templates/protocols/ospf/mpls-te/router-address/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 help: "Stable IP address of the advertising router"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"mpls-te router-address $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no mpls-te\"; "
diff --git a/templates/protocols/ospf/neighbor/node.def b/templates/protocols/ospf/neighbor/node.def
index 4c32123a..baa994d8 100644
--- a/templates/protocols/ospf/neighbor/node.def
+++ b/templates/protocols/ospf/neighbor/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv4
 help: "Neighbor IP address"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"neighbor $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no neighbor $(@)\"; "
diff --git a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
index f0422442..9bd63ae0 100644
--- a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Dead neighbor polling interval"
 syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535 seconds"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"neighbor $(../@) poll-interval $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no neighbor $(../@) poll-interval $(@)\"; "
diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
index a62838a3..7d50ed8b 100644
--- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Neighbor priority in seconds"
 syntax: $(@) >= 0 && $(@) <= 255; "Priority must be between 0-255"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"neighbor $(../@) priority $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no neighbor $(../@) priority $(@)\"; "
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index 8d40506b..24cb31e8 100644
--- a/templates/protocols/ospf/node.def
+++ b/templates/protocols/ospf/node.def
@@ -1,3 +1,3 @@
 help: "Configure OSPF for IPv4"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"no router ospf\" "
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" "
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no router ospf\" "
diff --git a/templates/protocols/ospf/parameters/abr-type/node.def b/templates/protocols/ospf/parameters/abr-type/node.def
index d9c5e8a1..9bd50e8a 100644
--- a/templates/protocols/ospf/parameters/abr-type/node.def
+++ b/templates/protocols/ospf/parameters/abr-type/node.def
@@ -2,7 +2,7 @@ type: txt
 help: "Set OSPF ABR type"
 default: "cisco"
 syntax: $(@) in "cisco", "ibm", "shortcut", "standard"; "Must be (cisco, ibm, shortcut, standard)"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"ospf abr-type $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no ospf abr-type $(@)\"; "
diff --git a/templates/protocols/ospf/parameters/opaque-lsa/node.def b/templates/protocols/ospf/parameters/opaque-lsa/node.def
index 5c530050..9e1e5b14 100644
--- a/templates/protocols/ospf/parameters/opaque-lsa/node.def
+++ b/templates/protocols/ospf/parameters/opaque-lsa/node.def
@@ -1,6 +1,6 @@
 help: "Enable the Opaque-LSA capability (rfc2370)"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"ospf opaque-lsa \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no ospf opaque-lsa \"; "
 
diff --git a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
index 0eb018e9..f689edb9 100644
--- a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
+++ b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
@@ -1,5 +1,5 @@
 help: "Enable rfc1583 criteria for handling AS external routes"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"ospf rfc1583compatibility \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"no ospf rfc1583compatibility \"; "
diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def
index e37ba0ee..b1902d49 100644
--- a/templates/protocols/ospf/parameters/router-id/node.def
+++ b/templates/protocols/ospf/parameters/router-id/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 help: "Override the default router identifier"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
            -c \"ospf router-id $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
            -c \"no ospf router-id \" "
diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def
index 10c5928b..f2b3267d 100644
--- a/templates/protocols/ospf/passive-interface/node.def
+++ b/templates/protocols/ospf/passive-interface/node.def
@@ -7,17 +7,17 @@ syntax: exec " \
           exit 1 ; \
         fi ; "
 update: "if [ x$(x) == xdefault ]; then \
-            /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
             -c \"passive-interface default\"; \
          else \
-            /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
             -c \"passive-interface $(@)\"; \
          fi; "
 delete: "if [ x$(x) == xdefault ]; then \
-            /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
             -c \"no passive-interface default\"; \
          else \
-            /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
             -c \"no passive-interface $(@)\"; \
          fi; "
 #allowed: local -a array;
diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def
index a4856c55..f09214b7 100644
--- a/templates/protocols/ospf/redistribute/bgp/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute BGP routes"
 delete: "touch /tmp/ospf-redist-bgp.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute bgp \"; \
       if [ -f \"/tmp/ospf-redist-bgp.\\$PPID\" ]; then \
         rm -rf /tmp/ospf-redist-bgp.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"redistribute bgp \\$COND\"; \
       fi; "
diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def
index 464bd1c8..77d286dd 100644
--- a/templates/protocols/ospf/redistribute/connected/node.def
+++ b/templates/protocols/ospf/redistribute/connected/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute connected routes"
 delete: "touch /tmp/ospf-redist-connected.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute connected \"; \
       if [ -f \"/tmp/ospf-redist-connected.\\$PPID\" ]; then \
         rm -rf /tmp/ospf-redist-connected.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"redistribute connected \\$COND\"; \
       fi; "
diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def
index e1f07f49..f8ab05e6 100644
--- a/templates/protocols/ospf/redistribute/kernel/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute kernel routes"
 delete: "touch /tmp/ospf-redist-kernel.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute kernel \"; \
       if [ -f \"/tmp/ospf-redist-kernel.\\$PPID\" ]; then \
         rm -rf /tmp/ospf-redist-kernel.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"redistribute kernel \\$COND\"; \
       fi; "
diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def
index 8db5ad72..fdf4ea4a 100644
--- a/templates/protocols/ospf/redistribute/rip/node.def
+++ b/templates/protocols/ospf/redistribute/rip/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute RIP routes"
 delete: "touch /tmp/ospf-redist-rip.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute rip \"; \
       if [ -f \"/tmp/ospf-redist-rip.\\$PPID\" ]; then \
         rm -rf /tmp/ospf-redist-rip.\\$PPID; \
@@ -11,7 +11,7 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"redistribute rip \\$COND\"; \
       fi; "
 
diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def
index 32c7bf83..ee9f387b 100644
--- a/templates/protocols/ospf/redistribute/static/node.def
+++ b/templates/protocols/ospf/redistribute/static/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute static routes"
 delete: "touch /tmp/ospf-redist-static.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no redistribute static \"; \
       if [ -f \"/tmp/ospf-redist-static.\\$PPID\" ]; then \
         rm -rf /tmp/ospf-redist-static.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
           -c \"redistribute static \\$COND\"; \
       fi; "
diff --git a/templates/protocols/ospf/refresh/timers/node.def b/templates/protocols/ospf/refresh/timers/node.def
index dfbb22e5..fe181359 100644
--- a/templates/protocols/ospf/refresh/timers/node.def
+++ b/templates/protocols/ospf/refresh/timers/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Set refresh timer"
 syntax: $(@) >= 10 && $(@) <= 1800; "must be between 10-1800"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no refresh timer\" -c \"refresh timer $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
         -c \"no refresh timer $(@)\"; "
 #comp_help: <10-1800> Timer value in seconds
diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def
index 54e39d0e..8478376a 100644
--- a/templates/protocols/ospf/timers/throttle/spf/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/node.def
@@ -1,10 +1,10 @@
 help: "OSPF SPF timers"
 delete: "touch /tmp/ospf-timer.\\$PPID"
 end: "if [ -f \"/tmp/ospf-timer.\\$PPID\" ]; then \
-         /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"no timers throttle spf\"; \
          rm /tmp/ospf-timer.\\$PPID; \
      else \
-         /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
          -c \"timers throttle spf $(delay/@) $(initial-holdtime/@) $(max-holdtime/@)\"; \
      fi; "