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

73 files changed, 148 insertions, 148 deletions

diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
index 1a1e429a..39446de3 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -3,5 +3,5 @@ type: u32
 help: "Configure a BGP Autonomous System on this router"
 # TODO: non-multinode parent
 syntax: $(@) >= 1 && $(@) <= 65535; "AS number must be between 1 and 65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"no router bgp $(@)\" "
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(@)\" "
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no router bgp $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.def b/templates/protocols/bgp/node.tag/aggregate-address/node.def
index 5094bd84..8a92ef2c 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/aggregate-address/node.def
@@ -3,7 +3,7 @@ type: ipv4net
 help: "Configure BGP aggregate entries"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
 delete: "touch /tmp/`echo $(@) | sed 's!/!!'`.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../@)\" \
         -c \"no aggregate-address $(@)\"; \
       if [ -f \"/tmp/`echo $(@) | sed 's!/!!'`.\\$PPID\" ]; then \
         rm -rf /tmp/`echo $(@) | sed 's!/!!'`.\\$PPID; \
@@ -14,6 +14,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
         if [ -n \"$(./summary-only/@)\" ]; then \
           COND=\"\\$COND summary-only\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../@)\" \
           -c \"aggregate-address $(@) \\$COND\"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def
index a655ae93..18abf799 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.def
@@ -3,7 +3,7 @@ type: txt
 help: "Specify neighbor router"
 syntax: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-peer-name $(@)"
 update: "if [ -n \"`echo $(@) | sed 's/[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}//'`\" ]; then \
-           /usr/bin/vtysh -c \"configure terminal\" -c\"router bgp $(../@)\" -c\"neighbor $(@) peer-group\" ; \
+           \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../@)\" -c \"neighbor $(@) peer-group\" ; \
          fi ; "
 delete: "/opt/vyatta/sbin/vyatta-bgp.pl --check-peer-groups --peergroup $(@) --as $(../@); \
-         /usr/bin/vtysh -c \"configure terminal\" -c\"router bgp $(../@)\" -c\"no neighbor $(@) \" "
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../@)\" -c \"no neighbor $(@) \" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
index 89406145..3816bfb0 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
@@ -7,8 +7,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) advertisement-interval $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) advertisement-interval\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
index e8cb6c9e..cdb5ea29 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
@@ -1,7 +1,7 @@
 help: "Accept as-path with my AS present in it."
 commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $(../../@) --neighbor $(../@)"
 delete: "touch /tmp/bgp-neighbor-$(../@)-allowas-in.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
          -c \"no neighbor $(../@) allowas-in \"; \
       if [ -f \"/tmp/bgp-neighbor-$(../@)-allowas-in.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-neighbor-$(../@)-allowas-in.\\$PPID; \
@@ -11,7 +11,7 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         else \
            peer=\"peer-group $(../peer-group/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) allowas-in $(./number/@)\"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
index 8dd65018..2d1749d1 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
@@ -2,7 +2,7 @@ help: "BGP attribute is propagated unchanged to this neighbor"
 commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $(../../@) --neighbor $(../@)"
 commit: $(../peer-group/) == ""; "You can't set attribute-unchanged for neighbor $(../@) in peer-group $(../peer-group/@)"
 delete: "touch /tmp/bgp-neighbor-$(../@)-attribute-unchanged.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no neighbor $(../@) attribute-unchanged \"; \
       if [ -f \"/tmp/bgp-neighbor-$(../@)-attribute-unchanged.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-neighbor-$(../@)-attribute-unchanged.\\$PPID; \
@@ -21,7 +21,7 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         else \
           peer=\"peer-group $(../peer-group/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) attribute-unchanged \\$cond\"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
index 0e354176..5c3473fd 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
@@ -5,9 +5,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) capability dynamic\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) capability dynamic\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
index 89b4cd60..6d518609 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
@@ -6,9 +6,9 @@ update: "if [ -n \"$(../../../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \
 	  -c \"neighbor $(../../../../@) \\$peer\" \
           -c \"neighbor $(../../../../@) capability orf prefix-list receive\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \
           -c \"no neighbor $(../../../../@) capability orf prefix-list receive\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
index e26917ac..29e70fd9 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
@@ -6,9 +6,9 @@ update: "if [ -n \"$(../../../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \
 	  -c \"neighbor $(../../../../@) \\$peer\" \
           -c \"neighbor $(../../../../@) capability orf prefix-list send\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \
           -c \"no neighbor $(../../../../@) capability orf prefix-list send\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
index b781dcaf..04d9af3b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
@@ -2,7 +2,7 @@ help: "Originate default route to this neighbor"
 commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $(../../@) --neighbor $(../@)"
 commit: $(../peer-group/) == ""; "You can't set default-originate for neighbor $(../@) in peer-group $(../peer-group/@)"
 delete: "touch /tmp/bgp-neighbor-$(../@)-default-originate.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no neighbor $(../@) default-originate \"; \
       if [ -f \"/tmp/bgp-neighbor-$(../@)-default-originate.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-neighbor-$(../@)-default-originate.\\$PPID; \
@@ -15,7 +15,7 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) default-originate \\$cond\"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
index 8a7199f3..fc33408a 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
@@ -5,9 +5,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) disable-connected-check\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) disable-connected-check \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
index 7d70fae2..79b6ea79 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
@@ -8,9 +8,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) distribute-list $(@) out\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) distribute-list $(@) out\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
index 32f406c5..16d8fa3d 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
@@ -8,9 +8,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) distribute-list $(@) in\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) distribute-list $(@) in\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/dont-capability-negotiate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/dont-capability-negotiate/node.def
index 6dc7c734..b499564d 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/dont-capability-negotiate/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/dont-capability-negotiate/node.def
@@ -5,9 +5,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
  	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) dont-capability-negotiate \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) dont-capability-negotiate \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
index eef363b5..01ec08a1 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
@@ -7,9 +7,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) ebgp-multihop $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) ebgp-multihop \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/enforce-multihop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/enforce-multihop/node.def
index 5c4fd5a2..ae4c8034 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/enforce-multihop/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/enforce-multihop/node.def
@@ -5,9 +5,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) enforce-multihop \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) enforce-multihop \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
index 07945538..639967d7 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
@@ -8,9 +8,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) filter-list $(@) out\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) filter-list $(@) out\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
index 44618b3b..b0709a5c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
@@ -8,9 +8,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) filter-list $(@) in\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) filter-list $(@) in\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def
index 29ec3a17..20ddd6c0 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def
@@ -11,8 +11,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) interface $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) interface $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
index 7330c76e..4606e719 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
@@ -2,7 +2,7 @@ help: "Specify a local-as number"
 commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $(../../@) --neighbor $(../@)"
 commit: $(../peer-group/) == ""; "You can't set a local-as for neighbor $(../../@) in peer-group $(../../peer-group/@)"
 delete: "touch /tmp/bgp-neighbor-$(../@)-local-as.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no neighbor $(../@) local-as \"; \
       if [ -f \"/tmp/bgp-neighbor-$(../@)-local-as.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-neighbor-$(../@)-local-as.\\$PPID; \
@@ -19,7 +19,7 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         else \
           peer=\"peer-group $(../peer-group/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) local-as $(./local-as/@) \\$cond \"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
index a412da4e..68b1244d 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
@@ -6,9 +6,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) maximum-prefix $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) maximum-prefix \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
index 9e1aa94a..22ebf77d 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
@@ -6,9 +6,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) next-hop-self\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) next-hop-self \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-activate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-activate/node.def
index 6f203b5a..f29ecde9 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-activate/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-activate/node.def
@@ -5,8 +5,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"no neighbor $(../@) activate \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"neighbor $(../@) activate \" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/extended/node.def
index 98c1b64a..5107ecf0 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/extended/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/extended/node.def
@@ -6,9 +6,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"no neighbor $(../../@) send-community extended\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"neighbor $(../../@) send-community extended\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/standard/node.def
index 60787ebb..008b3db5 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/standard/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/standard/node.def
@@ -5,9 +5,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"no neighbor $(../../@) send-community standard\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"neighbor $(../../@) send-community standard\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
index 34615d31..ab3dc3e6 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
@@ -6,9 +6,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) override-capability\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) override-capability \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
index 33a13007..2a5fe23c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
@@ -5,9 +5,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) passive\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) passive \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def
index a5a6931c..831fb658 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def
@@ -6,8 +6,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) password $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -n -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) password\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
index fab209fe..431f4b1d 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
@@ -5,7 +5,7 @@ syntax: exec "if [ -n \"`echo $(../@) | sed 's/[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-
               fi; "; "peer-group token may not be specified for a peer-group"
 commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --peergroup=$(@) --as $(../../@) --neighbor $(../@)"
 commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $(../../@) neighbor $(@)\" "; "peer-group $(@) doesn't exist"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"neighbor $(../@) peer-group $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) peer-group $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
index 5ea945f6..ce3144ea 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
@@ -7,8 +7,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) port $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) port \" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
index c2277ea9..c3eb4e44 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
@@ -8,9 +8,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) prefix-list $(@) out\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) prefix-list $(@) out\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
index 1d320e55..db1e2e14 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
@@ -8,9 +8,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) prefix-list $(@) in\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) prefix-list $(@) in\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
index 74235115..ba5dfc84 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Specify BGP neighbor ASN"
 syntax: $(@) >= 1 && $(@) <= 65535; "remote-as must be between 1 and 65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
           -c \"neighbor $(../@) remote-as $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) remote-as $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
index 0189f477..a7137866 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
@@ -6,9 +6,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) remove-private-AS \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) remove-private-AS  \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
index 0dc4c4ec..deb27e3e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
@@ -8,9 +8,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) route-map $(@) out\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) route-map $(@) out\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
index 913dc1cf..3e93c02f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
@@ -8,9 +8,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) route-map $(@) in\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) route-map $(@) in\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
index 22a8c4ce..cef63e3a 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
@@ -7,9 +7,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) route-reflector-client \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -n -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) route-reflector-client \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
index 3770f479..9601eb78 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
@@ -6,9 +6,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) route-server-client \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) route-server-client \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
index 12665c17..1c9b1fbe 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
@@ -5,8 +5,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) shutdown\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) shutdown\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
index 74770baf..8780ac0a 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
@@ -5,9 +5,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"neighbor $(../../@) soft-reconfiguration inbound \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"no neighbor $(../../@) soft-reconfiguration inbound \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
index cdacff33..906cf820 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
@@ -6,8 +6,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) strict-capability-match \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) strict-capability-match \" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
index 63ac6219..c759b252 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
@@ -2,9 +2,9 @@ help: "BGP per neighbor timers"
 commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $(../../@) --neighbor $(../@)"
 commit: $(../peer-group/) == ""; "You can't set timers for neighbor $(../@) in peer-group $(../peer-group/@)"
 delete: "touch /tmp/bgp-neighbor-$(../@)-timers.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no neighbor $(../@) timers \"; \
-      /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+      \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no neighbor $(../@) timers connect \"; \
       if [ -f \"/tmp/bgp-neighbor-$(../@)-timers.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-neighbor-$(../@)-timers.\\$PPID; \
@@ -15,12 +15,12 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           peer=\"peer-group $(../peer-group/@)\"; \
         fi; \
         if [ -n \"$(./connect/@)\" ]; then \
-          /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+          \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	    -c \"neighbor $(../@) \\$peer\" \
             -c \"neighbor $(../@) timers connect $(./connect/@)\" ; \
         fi ; \
         if [ -n \"$(./keepalive/@)\" ] || [ -n \"$(./holdtime/@)\" ]; then \
-          /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+          \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
 	    -c \"neighbor $(../@) \\$peer\" \
             -c \"neighbor $(../@) timers  $(./keepalive/@)  $(./holdtime/@)\"; \
         fi ; \
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
index 7ab36809..af3804b5 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
@@ -8,8 +8,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) unsuppress-map $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) unsuppress-map $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
index 95f565f1..16419693 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
@@ -11,8 +11,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) update-source $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) update-source $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
index 980e6cfc..6e240efe 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
@@ -7,8 +7,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) weight $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) weight $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/network/node.def b/templates/protocols/bgp/node.tag/network/node.def
index 27600d65..848728d9 100644
--- a/templates/protocols/bgp/node.tag/network/node.def
+++ b/templates/protocols/bgp/node.tag/network/node.def
@@ -4,7 +4,7 @@ help: "Specify a network to announce via BGP"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
 commit: !($(./backdoor/) != "" && $(./route-map/) != ""); "May specify route-map or backdoor but not both" 
 delete: "touch /tmp/`echo $(@) | sed 's!/!!'`.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\"     \ 
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../@)\"     \ 
       -c \"no network $(@)\";                                                \
       if [ -f \"/tmp/`echo $(@) | sed 's!/!!'`.\\$PPID\" ]; then             \
         rm -rf /tmp/`echo $(@) | sed 's!/!!'`.\\$PPID;                       \
@@ -15,6 +15,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\"     \
         if [ -n \"$(./route-map/@)\" ]; then                                 \
           COND=\"route-map $(./route-map/@)\";                               \
         fi;                                                                  \
-          /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+          \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../@)\" \
           -c \"network $(@) \\$COND\";                                       \
       fi; " 
diff --git a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def b/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
index 59cf867e..bf0959c9 100644
--- a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
@@ -1,5 +1,5 @@
 help: "Allow comparing MED from different neighbors"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp always-compare-med\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"no bgp always-compare-med\" "
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
index 03adee5e..d5e39a06 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
@@ -1,6 +1,6 @@
 help: "Compare path lengths including confederation sets & sequences in selecting a route"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
            -c \"bgp bestpath as-path confed \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
            -c \"no bgp bestpath as-path confed \" "
 
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
index dd346995..46385534 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
@@ -1,5 +1,5 @@
 help: "Ignore as-path length in selecting a route"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
            -c \"bgp bestpath as-path ignore \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
            -c \"no bgp bestpath as-path ignore \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
index 8c8f598c..ba6a7ab4 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
@@ -1,6 +1,6 @@
 help: "Compare router-id for identical EBGP paths"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"bgp bestpath compare-routerid \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"no bgp bestpath compare-routerid \" "
 
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
index 219d73d7..7de7aa6c 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
@@ -1,6 +1,6 @@
 help: "Compare MED among confederation paths"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
            -c \"bgp bestpath med confed \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
            -c \"no bgp bestpath med confed \" "
 
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
index 0f9316be..7abff30d 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
@@ -1,6 +1,6 @@
 help: "Treat missing MED as the least preferred one"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
            -c \"bgp bestpath med missing-as-worst \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \
            -c \"no bgp bestpath med missing-as-worst \" "
 
diff --git a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
index 492a8e83..c29c5c23 100644
--- a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 help: "Configure route-reflector cluster-id\n"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp cluster-id $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"no bgp cluster-id \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
index 826d32c5..ad978f35 100644
--- a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Configure confederation AS id"
 syntax: $(@) >= 1 && $(@) <= 65535; "confederation AS id must be between 1 and 65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"bgp confederation identifier $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"no bgp confederation identifier \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
index 38042e17..a363a478 100644
--- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
@@ -2,7 +2,7 @@ multi:
 type: u32
 help: "Peer ASs in BGP confederation"
 syntax: $(@) >= 1 && $(@) <= 65535; "confederation AS id must be between 1 and 65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"bgp confederation peers $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"no bgp confederation peers $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/node.def
index 987c30c4..487725dc 100644
--- a/templates/protocols/bgp/node.tag/parameters/dampening/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/dampening/node.def
@@ -1,12 +1,12 @@
 help: "Enable route-flap dampening"
 delete: "touch /tmp/bgp-dampening.\\$PPID"
 end: "sh -c \"
-      /usr/bin/vtysh -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \
+      \\${vyatta_sbindir}/vyatta-vtysh.pl -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \
         -c \\\"no bgp dampening\\\" ; \
       if [ -f \\\"/tmp/bgp-dampening.\\\\$PPID\\\" ]; then \
         rm -f \\\"/tmp/bgp-dampening.\\\\$PPID\\\" ; \
       else \
-        /usr/bin/vtysh -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \
           -c \\\"bgp dampening $(./half-life/@) $(./re-use/@) $(./start-suppress-time/@) $(./max-suppress-time/@)\\\" ; \
       fi ; \
       \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def b/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
index c8c5bb44..0b2f4501 100644
--- a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
@@ -1,6 +1,6 @@
 type: u32
 help: "Local preference (higher=more preferred)"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"bgp default local-preference $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"no bgp default local-preference\" "
diff --git a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
index 66f77ded..cb184c4b 100644
--- a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
@@ -1,5 +1,5 @@
 help: "Deactivate IPv4 unicast for a peer by default"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"no bgp default ipv4-unicast\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"bgp default ipv4-unicast\" "
diff --git a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
index 2f816856..e74fd24f 100644
--- a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
@@ -1,5 +1,5 @@
 help: "Pick the best-MED path among paths advertised from the neighboring AS"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp deterministic-med \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"no bgp deterministic-med \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def b/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
index 9263395a..f08645a7 100644
--- a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
@@ -1,5 +1,5 @@
 help: "Enforce the first AS for EBGP routes"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp enforce-first-as \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"no bgp enforce-first-as \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def b/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
index 8c28175e..e4e5ae3a 100644
--- a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Set the max time in seconds to hold onto restarting peer's stale paths"
 syntax: $(@) >= 1 && $(@) <= 3600; "stalepath-time must be between 1 and 3600"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"bgp graceful-restart stalepath-time $(@) \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"no bgp graceful-restart stalepath-time \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def b/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
index d4a64a82..eb9184a4 100644
--- a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
@@ -1,5 +1,5 @@
 help: "Log neighbor up/down and reset reason"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp log-neighbor-changes \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"no bgp log-neighbor-changes \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/network/import-check/node.def b/templates/protocols/bgp/node.tag/parameters/network/import-check/node.def
index 0c6ced5d..65d058a4 100644
--- a/templates/protocols/bgp/node.tag/parameters/network/import-check/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/network/import-check/node.def
@@ -1,5 +1,5 @@
 help: "Check BGP network route exists in IGP"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"bgp network import-check \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"no bgp network import-check \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def b/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
index 41ee28db..5121991f 100644
--- a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
@@ -1,5 +1,5 @@
 help: "Disable client to client route reflection"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"no bgp client-to-client reflection \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp client-to-client reflection \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def b/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
index a53214e0..d25928d8 100644
--- a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
@@ -1,5 +1,5 @@
 help: "Immediately reset session if a link to a directly connected external peer goes down"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"no bgp fast-external-failover \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp fast-external-failover \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/router-id/node.def b/templates/protocols/bgp/node.tag/parameters/router-id/node.def
index 645ecb6f..dcba9f4f 100644
--- a/templates/protocols/bgp/node.tag/parameters/router-id/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/router-id/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 help: "Override configured router identifier"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp router-id $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"no bgp router-id \" "
diff --git a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
index f98dd34a..cfb0ef23 100644
--- a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
@@ -1,7 +1,7 @@
 type: u32
 syntax: $(@) >= 5 && $(@) <= 60; "scan-time must be between 5 and 60 seconds"
 help: "Configure background scanner interval"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp scan-time $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"no bgp scan-time \" "
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/node.def
index 32b65d98..1e78e6bb 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/connected/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute connected routes"
 delete: "touch /tmp/bgp-redist-connected.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no redistribute connected \"; \
       if [ -f \"/tmp/bgp-redist-connected.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-redist-connected.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"redistribute connected \\$COND\"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
index 6c270552..57e0531a 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute kernel routes"
 delete: "touch /tmp/bgp-redist-kernel.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no redistribute kernel \"; \
       if [ -f \"/tmp/bgp-redist-kernel.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-redist-kernel.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"redistribute kernel \\$COND\"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
index 34ce3597..445b9869 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute OSPF routes"
 delete: "touch /tmp/bgp-redist-ospf.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no redistribute ospf \"; \
       if [ -f \"/tmp/bgp-redist-ospf.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-redist-ospf.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"redistribute ospf \\$COND\"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/node.def b/templates/protocols/bgp/node.tag/redistribute/rip/node.def
index 6681b909..c2a4b239 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/rip/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute RIP routes"
 delete: "touch /tmp/bgp-redist-rip.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no redistribute rip \"; \
       if [ -f \"/tmp/bgp-redist-rip.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-redist-rip.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"redistribute rip \\$COND\"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/node.def b/templates/protocols/bgp/node.tag/redistribute/static/node.def
index eeeb6fa1..ebf8bc87 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/static/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute static routes"
 delete: "touch /tmp/bgp-redist-static.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         -c \"no redistribute static \"; \
       if [ -f \"/tmp/bgp-redist-static.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-redist-static.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"redistribute static \\$COND\"; \
       fi; "
diff --git a/templates/protocols/bgp/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/timers/node.def
index 30fa51bb..51475580 100644
--- a/templates/protocols/bgp/node.tag/timers/node.def
+++ b/templates/protocols/bgp/node.tag/timers/node.def
@@ -2,11 +2,11 @@ help: "Adjust routing timers"
 commit: $(./keepalive/) != ""; "You must set a keepalive interval"
 commit: $(./holdtime/) != ""; "You must set a holdtime interval"
 delete: "touch /tmp/bgp-timers.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../@)\" \
         -c \"no timers bgp\"; \
       if [ -f \"/tmp/bgp-timers.\\$PPID\" ]; then \
         rm -rf /tmp/bgp-timers.\\$PPID; \
       else \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../@)\" \
           -c \"timers bgp $(./keepalive/@) $(./holdtime/@)\"; \
       fi; "