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

24 files changed, 53 insertions, 50 deletions

diff --git a/templates/protocols/rip/default-distance/node.def b/templates/protocols/rip/default-distance/node.def
index 5960fc75..a8ff5914 100644
--- a/templates/protocols/rip/default-distance/node.def
+++ b/templates/protocols/rip/default-distance/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Administrative distance"
 syntax: $(@) >= 1 && $(@) <= 255; "must be between 1 and 255"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \ 
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ 
           -c \"distance $(@) \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \ 
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ 
           -c \"no distance $(@) \" "
 #comp_help: Enter a distance valude between 1-255
diff --git a/templates/protocols/rip/default-information/originate/node.def b/templates/protocols/rip/default-information/originate/node.def
index 97fe83aa..d5b7b20e 100644
--- a/templates/protocols/rip/default-information/originate/node.def
+++ b/templates/protocols/rip/default-information/originate/node.def
@@ -1,6 +1,6 @@
 help: "Distribute a default route"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"default-information originate\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"no default-information originate\" "
 
diff --git a/templates/protocols/rip/default-metric/node.def b/templates/protocols/rip/default-metric/node.def
index 8151814e..16ec94c0 100644
--- a/templates/protocols/rip/default-metric/node.def
+++ b/templates/protocols/rip/default-metric/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Set metric of redistributed routes"
 syntax: $(@) >= 1 && $(@) <= 16; "Must be between 1-16"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"default-metric $(@) \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no default-metric $(@) \"; "
 #comp_help <1-16>  Default metric
diff --git a/templates/protocols/rip/distribute-list/access-list/in/node.def b/templates/protocols/rip/distribute-list/access-list/in/node.def
index c7ab7852..c78ad2fb 100644
--- a/templates/protocols/rip/distribute-list/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/in/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "access-list to apply to input packets"
 commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"distribute-list $(@) in\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"no distribute-list $(@) in\" "
                      
diff --git a/templates/protocols/rip/distribute-list/access-list/out/node.def b/templates/protocols/rip/distribute-list/access-list/out/node.def
index 5612375b..96855ca4 100644
--- a/templates/protocols/rip/distribute-list/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/out/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "access-list to apply to output packets"
 commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"distribute-list $(@) out\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"no distribute-list $(@) out\" "
 
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
index e5f88e61..4c0b0c1f 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "access-list to apply to input packets"
 commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"distribute-list $(@) in $(../../@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"no distribute-list $(@) in $(../../@)\" "
 
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
index ce719a73..a3d4477c 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "access-list to apply to output packets"
 commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"distribute-list $(@) out $(../../@) \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"no distribute-list $(@) out $(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
index 844aa91a..ce3de387 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: "prefix-list to apply to input packets"
 commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"distribute-list prefix $(@) in $(../../@) \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"no distribute-list prefix $(@) in $(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
index c82f34df..48a97014 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: "prefix-list to apply to output packets"
 commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"distribute-list prefix $(@) out $(../../@) \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"no distribute-list prefix $(@) out $(../../@)\" "
diff --git a/templates/protocols/rip/distribute-list/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
index 98271556..2a79d94e 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: "prefix-list to apply to input packets"
 commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"distribute-list prefix $(@) in\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"no distribute-list prefix $(@) in\" "
                     
diff --git a/templates/protocols/rip/distribute-list/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
index 89dd3ff4..78d3f8bd 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
@@ -1,7 +1,7 @@
 type: txt
 help: "prefix-list to apply to output packets"
 commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"distribute-list prefix $(@) out\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\"  \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
            -c \"no distribute-list prefix $(@) out\" "
diff --git a/templates/protocols/rip/interface/node.def b/templates/protocols/rip/interface/node.def
index a5045a05..e9e6fc8e 100644
--- a/templates/protocols/rip/interface/node.def
+++ b/templates/protocols/rip/interface/node.def
@@ -6,5 +6,8 @@ syntax: exec " \
           echo ethernet interface $(@) doesn\\'t exist on this system ; \
           exit 1 ; \
         fi ; "
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" -c \"network $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" -c \"no network $(@)\" "
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" -c \"network $(@)\" "
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" -c \"no network $(@)\" "
+#allowed: local -a array;
+# array=( /sys/class/net/{eth,vmnet}* ) ;
+# echo -n ${array[@]##*/}
diff --git a/templates/protocols/rip/neighbor/node.def b/templates/protocols/rip/neighbor/node.def
index 1b4d7ce5..c20ddc56 100644
--- a/templates/protocols/rip/neighbor/node.def
+++ b/templates/protocols/rip/neighbor/node.def
@@ -1,8 +1,8 @@
 multi:
 type: ipv4
 help: "Specify a neighbor router"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"neighbor $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no neighbor $(@)\"; "
 
diff --git a/templates/protocols/rip/network-distance/node.def b/templates/protocols/rip/network-distance/node.def
index 6159b5aa..480e1f26 100644
--- a/templates/protocols/rip/network-distance/node.def
+++ b/templates/protocols/rip/network-distance/node.def
@@ -9,10 +9,10 @@ end: "if [ -n \"$(./access-list/@)\" ]; then \
       fi; \
       if [ -f \"/tmp/rip-dist.\\$PPID\" ]; then \
           dist=\\$(cat /tmp/rip-network-distance.\\$PPID); \
-          /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \ 
+          \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ 
           -c \"no distance \\$dist $(@) \\$ACL \" ;
           rm -f \"/tmp/rip-dist.\\$PPID\";
       else \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \ 
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ 
           -c \"distance $(./distance/@) $(@) \\$ACL \" ;
       fi; "
diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def
index f8188dca..7feec8ae 100644
--- a/templates/protocols/rip/network/node.def
+++ b/templates/protocols/rip/network/node.def
@@ -2,7 +2,7 @@ multi:
 type: ipv4net
 help: "RIP network"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"network $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"no network $(@)\"; "
diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def
index d0f099cb..888686cf 100644
--- a/templates/protocols/rip/node.def
+++ b/templates/protocols/rip/node.def
@@ -1,4 +1,4 @@
 help: "RIP options"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"no router rip\" "
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" "
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no router rip\" "
 
diff --git a/templates/protocols/rip/passive-interface/node.def b/templates/protocols/rip/passive-interface/node.def
index 903a1e79..85a1bf22 100644
--- a/templates/protocols/rip/passive-interface/node.def
+++ b/templates/protocols/rip/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 rip\" \
+            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
             -c \"passive-interface default\"; \
          else \
-            /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
             -c \"passive-interface $(@)\"; \
          fi; "
 delete: "if [ x$(x) == xdefault ]; then \
-            /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
             -c \"no passive-interface default\"; \
          else \
-            /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
             -c \"no passive-interface $(@)\"; \
          fi; "
 #allowed: local -a array;
diff --git a/templates/protocols/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def
index 727cff10..d69e22b2 100644
--- a/templates/protocols/rip/redistribute/bgp/node.def
+++ b/templates/protocols/rip/redistribute/bgp/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute BGP routes"
 delete: "touch /tmp/rip-redist-bgp.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute bgp \"; \
       if [ -f \"/tmp/rip-redist-bgp.\\$PPID\" ]; then \
         rm -rf /tmp/rip-redist-bgp.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute bgp \\$COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/connected/node.def b/templates/protocols/rip/redistribute/connected/node.def
index 9af10ca8..46dc83f3 100644
--- a/templates/protocols/rip/redistribute/connected/node.def
+++ b/templates/protocols/rip/redistribute/connected/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute connected routes"
 delete: "touch /tmp/rip-redist-connected.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute connected \"; \
       if [ -f \"/tmp/rip-redist-connected.\\$PPID\" ]; then \
         rm -rf /tmp/rip-redist-connected.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute connected \\$COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/kernel/node.def b/templates/protocols/rip/redistribute/kernel/node.def
index 6ca8d055..6ac0b1ab 100644
--- a/templates/protocols/rip/redistribute/kernel/node.def
+++ b/templates/protocols/rip/redistribute/kernel/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute kernel routes"
 delete: "touch /tmp/rip-redist-kernel.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute kernel \"; \
       if [ -f \"/tmp/rip-redist-kernel.\\$PPID\" ]; then \
         rm -rf /tmp/rip-redist-kernel.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute kernel \\$COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/ospf/node.def b/templates/protocols/rip/redistribute/ospf/node.def
index dfa076d9..cc95c6a5 100644
--- a/templates/protocols/rip/redistribute/ospf/node.def
+++ b/templates/protocols/rip/redistribute/ospf/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute OSPF routes"
 delete: "touch /tmp/rip-redist-ospf.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute ospf \"; \
       if [ -f \"/tmp/rip-redist-ospf.\\$PPID\" ]; then \
         rm -rf /tmp/rip-redist-ospf.\\$PPID; \
@@ -11,7 +11,7 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute ospf \\$COND\"; \
       fi; "
 
diff --git a/templates/protocols/rip/redistribute/static/node.def b/templates/protocols/rip/redistribute/static/node.def
index 8cbbfc1b..a4a7cbb7 100644
--- a/templates/protocols/rip/redistribute/static/node.def
+++ b/templates/protocols/rip/redistribute/static/node.def
@@ -1,6 +1,6 @@
 help: "Redistribute static routes"
 delete: "touch /tmp/rip-redist-static.\\$PPID" 
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute static \"; \
       if [ -f \"/tmp/rip-redist-static.\\$PPID\" ]; then \
         rm -rf /tmp/rip-redist-static.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
         if [ -n \"$(./route-map/@)\" ]; then \
           COND=\"\\$COND route-map $(./route-map/@)\"; \
         fi; \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute static \\$COND\"; \
       fi; "
diff --git a/templates/protocols/rip/route/node.def b/templates/protocols/rip/route/node.def
index 327c9d09..5983d3a8 100644
--- a/templates/protocols/rip/route/node.def
+++ b/templates/protocols/rip/route/node.def
@@ -2,8 +2,8 @@ multi:
 type: ipv4net
 help: "RIP static route configuration"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
          -c \"route $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
          -c \"no route $(@)\" "
 
diff --git a/templates/protocols/rip/timers/node.def b/templates/protocols/rip/timers/node.def
index 9f1d1ea2..08bb0234 100644
--- a/templates/protocols/rip/timers/node.def
+++ b/templates/protocols/rip/timers/node.def
@@ -1,11 +1,11 @@
 help: "Set RIP timer values"
 delete: "touch /tmp/rip-timers.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no timers basic\"; \
       if [ -f \"/tmp/rip-timers.\\$PPID\" ]; then \
         rm -rf /tmp/rip-timers.\\$PPID; \
       else \
-        /usr/bin/vtysh -c \"configure terminal\" -c \"router rip\" \
+        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"timers basic $(./update/@) $(./timeout/@) $(./garbage-collection/@)\"; \
       fi; "