diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2007-12-12 20:12:56 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2007-12-12 20:12:56 -0800 |
| commit | ccc86da96be587935f616ce5ce8715c67f6d2f87 (patch) | |
| tree | ccce5e903de713d790d9d11b07bd590b9bc4c92b /templates/protocols/rip/redistribute | |
| parent | 51e5d904b6a51ed07a0eaeda12c1d15c1f6a8c0a (diff) | |
| download | vyatta-cfg-quagga-ccc86da96be587935f616ce5ce8715c67f6d2f87.tar.gz vyatta-cfg-quagga-ccc86da96be587935f616ce5ce8715c67f6d2f87.zip | |
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
Diffstat (limited to 'templates/protocols/rip/redistribute')
5 files changed, 10 insertions, 10 deletions
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; " |