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