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

15 files changed, 30 insertions, 30 deletions

diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def
index ac984fb4..40823db5 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def
@@ -5,12 +5,12 @@ syntax: $(@) >= 1 && $(@) <= 255; "ID must be between (1-255)"
 commit: $(md5-key/) != ""; "must add the md5-key for key-id $(@)"
 delete: "touch /tmp/ospf-md5.\\$PPID"
 end: "if [ -f \"/tmp/ospf-md5.\\$PPID\" ]; then                    \
-         /usr/bin/vtysh -c \"configure terminal\"                  \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
           -c \"interface $(../../../../../@) \"                    \
           -c \"no ip ospf message-digest-key $(@)\";               \
          rm /tmp/ospf-md5.\\$PPID;                                 \
       else                                                         \
-         /usr/bin/vtysh -c \"configure terminal\"                  \
+         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
           -c \"interface $(../../../../../@) \"                    \
           -c \"ip ospf message-digest-key $(@) md5 $(md5-key/@)\"; \
       fi; "
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
index 50fca5ea..eb1bc11b 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,9 +1,9 @@
 help: "Configure MD5 key id"
-update: "/usr/bin/vtysh -c \"configure terminal\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
          -c \"interface $(../../../../@) \"       \
          -c \"no ip ospf authentication \"        \
          -c \"ip ospf authentication message-digest\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
          -c \"interface $(../../../../@) \"       \
          -c \"no ip ospf authentication \"; "
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def
index 28d1b2f2..90994816 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def
@@ -1,11 +1,11 @@
 type: txt
 help: "Configure simple password"
-update: "/usr/bin/vtysh -c \"configure terminal\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
          -c \"interface $(../../../../@) \"       \
 	 -c \"no ip ospf authentication \"        \
 	 -c \"ip ospf authentication \"           \
 	 -c \"ip ospf authentication-key $(@) \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
          -c \"interface $(../../../../@) \"       \
 	 -c \"no ip ospf authentication \"        \
 	 -c \"no ip ospf authentication-key \"; "
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
index 8d7f7dd7..b228a0f6 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
@@ -1,9 +1,9 @@
 type: u32
 help: "Interface cost"
 syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
         -c \"ip ospf cost $(@) \"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
         -c \"no ip ospf cost \"; "
 #comp_help: <1-65535> Cost
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
index c27284e1..9926fe18 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
@@ -1,9 +1,9 @@
 type: u32
 help: "Interval after which a neighbor is declared dead"
 syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"ip ospf dead-interval $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"no ip ospf dead-interval \"; "
 #comp_help: <1-65535> Seconds
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
index d9f7512d..0822c9af 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Interval between HELLO packets"
 syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@) \" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@) \" \
           -c \"ip ospf hello-interval $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@) \" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@) \" \
           -c \"no ip ospf hello-interval \"; "
 #comp_help: <1-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
index b976efa0..dbf7f5e3 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,5 +1,5 @@
 help: "Disable mtu mismatch detection"
-create: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"ip ospf mtu-ignore\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
index 31116253..07587cd4 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: "Network type"
 syntax: $(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"ip ospf network $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"no ip ospf network \"; "
 #comp_help: Enter the network type (broadcast|non-broadcast|point-to-multipoint|point-to-point)
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
index 4b654ab8..6e06c908 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Router priority"
 syntax: $(@) >= 0 && $(@) <= 255; "Must be between 0-255"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"ip ospf priority $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"no ip ospf priority \"; "
 #comp_help: <0-255> Priority
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
index b428e2e8..963000a5 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Interval between retransmitting lost link state advertisements"
 syntax: $(@) >= 3 && $(@) <= 65535; "Must be between 3-65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"ip ospf retransmit-interval $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"no ip ospf retransmit-interval \"; "
 #comp_help: <3-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
index 6f27e1e0..a69d011c 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: "Link state transmit delay"
 syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"ip ospf transmit-delay $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
           -c \"no ip ospf transmit-delay \"; "
 #comp_help: <1-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index ada3abab..e5e140be 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: "Authentication password"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../../@)\" \
           -c \"ip rip authentication mode md5\" -c \"ip rip authentication key-chain $(../../../../../@)-rip\" \
           -c \"key chain $(../../../../../@)-rip\" -c \"key $(../@)\" -c \"key-string $(@)\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../../@)\" \
           -c \"no ip rip authentication mode md5\" -c \"no ip rip authentication key-chain $(../../../../../@)-rip\" \
           -c \"no key chain $(../../../../../@)-rip\" "
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def
index 5b062697..39243b12 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: "Simple password authentication key"
-update: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../../@)\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../@)\" \
           -c \"ip rip authentication mode text\" -c \"ip rip authentication string $(@)\"; "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"interface $(../../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../@)\" \
           -c \"no ip rip authentication mode\" -c \"no ip rip authentication string $(@)\"; "
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def
index 16dc4330..529d6749 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def
@@ -1,8 +1,8 @@
 help: "Enable split horizon on this interface"
-update: "/usr/bin/vtysh -c \"configure terminal\" \
+update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
           -c \"interface $(../../../@)\" \
           -c \"ip rip split-horizon\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
           -c \"interface $(../../../@)\" \
           -c \"no ip rip split-horizon\" "
 
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index 912afee3..b6c2baf2 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,8 +1,8 @@
 help: "With poison reverse"
-create: "/usr/bin/vtysh -c \"configure terminal\" \
+create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
           -c \"interface $(../../../../@)\" \
           -c \"ip rip split-horizon poisoned-reverse\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
           -c \"interface $(../../../../@)\" \
           -c \"no ip rip split-horizon\" -c \"ip rip split-horizon\" "