diff options
| author | An-Cheng Huang <ancheng@ancheng-vm.localdomain> | 2007-10-01 14:17:06 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@ancheng-vm.localdomain> | 2007-10-01 14:17:06 -0700 |
| commit | cda784ae0d8e3d4c08daa3b4225156f34122b4c2 (patch) | |
| tree | b6d62e7dabec6ea45a09a6ee2f805f079c25c920 | |
| parent | cfa368bbc1d4c55c42c60838e04fc523625932b7 (diff) | |
| download | vyatta-cfg-quagga-cda784ae0d8e3d4c08daa3b4225156f34122b4c2.tar.gz vyatta-cfg-quagga-cda784ae0d8e3d4c08daa3b4225156f34122b4c2.zip | |
fixed dependency and quagga path.
97 files changed, 235 insertions, 234 deletions
diff --git a/debian/control b/debian/control index 0a1b33aa..148bbe2a 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,8 @@ Depends: bash (>= 3.1), sed (>= 4.1.5), perl (>= 5.8.8), procps (>= 1:3.2.7-3), - coreutils (>= 5.97-5.3) + coreutils (>= 5.97-5.3), + vyatta-cfg, quagga Suggests: util-linux (>= 2.13-5), net-tools, ethtool, diff --git a/scripts/policy/vyatta-policy.pl b/scripts/policy/vyatta-policy.pl index bc4a28e1..928c69f6 100755 --- a/scripts/policy/vyatta-policy.pl +++ b/scripts/policy/vyatta-policy.pl @@ -3,7 +3,7 @@ use lib "/opt/vyatta/share/perl5/"; use VyattaConfig; use VyattaMisc; use Getopt::Long; -$VTYSH='/opt/vyatta/bin/vtysh'; +$VTYSH='/usr/bin/vtysh'; GetOptions("update-access-list=s" => \$accesslist, "update-aspath-list=s" => \$aspathlist, diff --git a/templates/policy/prefix-list/node.tag/rule/node.def b/templates/policy/prefix-list/node.tag/rule/node.def index 7750cba9..55c1e70c 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.def @@ -9,7 +9,7 @@ delete: "touch /tmp/protocols-$(../@)-$(@).\\$PPID \ if [ -n \"$(./le/@)\" ] && [ $(./le/@) -ne 32 ]; then \ COND=\"\\$COND le $(./le/@) \"; \ fi; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" \ + /usr/bin/vtysh -c \"configure terminal\" \ -c \"no ip prefix-list $(../@) seq $(@) $(./action/@) $(./prefix/@) \\$COND \" " end: "LEN=`echo $(@) | awk -F/ '{ print \\$2 }'` ; \ if [ -n \"$(./ge/@)\" ]; then \ @@ -29,7 +29,7 @@ end: "LEN=`echo $(@) | awk -F/ '{ print \\$2 }'` ; \ if [ -f \"/tmp/protocols-$(../@)-$(@).\\$PPID\" ]; then \ rm -f \"protocols-$(../@)-$(@).\\$PPID\" ; \ else \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" \ + /usr/bin/vtysh -c \"configure terminal\" \ -c \"ip prefix-list $(../@) seq $(@) $(./action/@) $(./prefix/@) \\$COND \" ; \ fi ; \ exit 0 ; " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def index f594fdb6..7908bd5b 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def @@ -1,6 +1,6 @@ type: txt help: "action to take on prefixes matching this rule" syntax: $(@) in "permit", "deny"; "route-map $(../../@) $(@) $(../@) action: must be permit or deny" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(@) $(../@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(@) $(../@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"no route-map $(../../@) $(@) $(../@)\" " +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(@) $(../@)\" " +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(@) $(../@)\" " +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"no route-map $(../../@) $(@) $(../@)\" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def index bfddaec9..6ef93c25 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def @@ -2,9 +2,9 @@ type: txt help: "Target route-map name" syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\"; "route-map $(@) doesn't exist" commit: $(../action/@); "must define an action for route-map $(../../@) rule $(../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \ -c \"call $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \ -c \"call $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \ -c \"no call \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def index 1054bdb5..57ade6c1 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def @@ -2,12 +2,12 @@ type: txt help: "Match BGP AS path list" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $(@)\"; "aspath-list $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match as-path $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match as-path $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no match as-path $(@)\" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def index 64c477ad..15a2be66 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def @@ -4,7 +4,7 @@ end: "if [ -z \"$(./community-list/)\" ]; then \ echo You must configure a community-list ; \ exit 1 ; \ fi ; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" \ + /usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no match community \" ; \ if [ -f \"/tmp/policy-route-map-$(../../../@)-$(../../action/@)-$(../../@)-match-community.\\$PPID\" ]; then \ @@ -13,7 +13,7 @@ end: "if [ -z \"$(./community-list/)\" ]; then \ if [ -n \"$(./exact-match/)\" ]; then \ COND=\"exact-match \"; \ fi ; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" \ + /usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match community $(./community-list/@) \\$COND\" ; \ fi; " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def index 2db98b6c..232e39eb 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def @@ -7,12 +7,12 @@ syntax: exec " \ echo $(@) doesn\\'t exist on this system ; \ exit 1 ; \ fi ; " -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match interface $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match interface $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no match interface $(@)\" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def index 6b7dcab7..dafc37e2 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def @@ -1,13 +1,13 @@ type: u32; "route-map $(../../../@) $(../../action/@) $(../../@) metric: must be an integer" help: "Match metric of route" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match metric $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match metric $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no match metric $(@)\" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def index 84ecc6e4..e04d5a77 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def @@ -2,13 +2,13 @@ type: txt help: "BGP origin code" syntax: $(@) in "egp", "igp", "incomplete"; "origin must be egp, igp, or incomplete" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match origin $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match origin $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no match origin $(@)\" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def index a71801c7..28b4661f 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def @@ -2,13 +2,13 @@ type: txt help: "Match peer address" syntax: exec "/opt/vyatta/sbin/vyatta_policy.pl --check-peer-syntax $(@)"; "peer must be either an IP or local" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match peer $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match peer $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no match peer \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def index 14d0c0f9..8cd5d642 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def @@ -2,13 +2,13 @@ type: u32 help: "Match tag of route" syntax: $(@) >= 1 && $(@) <= 65535; "tag must be between 1 and 65535" commit: $(../../action/@); "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match tag $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match tag $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no match tag $(@)\" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def index d4fc4dfc..22c1d123 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def @@ -3,12 +3,12 @@ help: "Goto sequence number" syntax: $(../next/@) != ""; "you can set only goto or next" syntax: $(@) >= 1 && $(@) <= 65535; "tag must be between 1 and 65535" commit: $(../../action/@); "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"on-match goto $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"on-match goto $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no on-match goto $(@)\" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def index eaffea3c..d270b863 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def @@ -1,13 +1,13 @@ help: "Goto next sequence number" syntax: $(../goto/@) != ""; "you can set only goto or next" commit: $(../../action/@); "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"on-match next \" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"on-match next \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no on-match next \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def index f86cfe5d..28a564a5 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def @@ -4,13 +4,13 @@ end: "if [ -z \"$(./as/)\" ] || [ -z \"$(./ip/)\" ]; then \ echo You must configure as and ip ; \ exit 1 ; \ fi ; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" \ + /usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set aggregator \" ; \ if [ -f \"/tmp/policy-route-map-$(../../../@)-$(../../action/@)-$(../../@)-set-aggregator.\\$PPID\" ]; then \ rm -rf /tmp/policy-route-map-$(../../../@)-$(../../action/@)-$(../../@)-set-aggregator.\\$PPID; \ else \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" \ + /usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"match community $(./as/@) $(./ip/@)\" ; \ fi; " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def index 9e602cb2..5f18167a 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def @@ -1,12 +1,12 @@ type: txt; help: "Prepend string for a BGP AS-path attribute" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set as-path prepend $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set as-path prepend $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set as-path prepend \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def index 233ee4a5..9b32cbec 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def @@ -1,11 +1,11 @@ help: "BGP atomic aggregate attribute" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set atomic-aggregate\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set atomic-aggregate\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set atomic-aggregate\" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def index 613897fd..78491435 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def @@ -4,7 +4,7 @@ end: "if [ -z \"$(./comm-list/)\" ]; then \ echo You must configure a comm-list ; \ exit 1 ; \ fi ; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" \ + /usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set comm-list \" ; \ if [ -f \"/tmp/policy-route-map-$(../../../@)-$(../../action/@)-$(../../@)-set-comm-list.\\$PPID\" ]; then \ @@ -13,7 +13,7 @@ end: "if [ -z \"$(./comm-list/)\" ]; then \ if [ -n \"$(./delete/)\" ]; then \ COND=\"delete\" ; \ fi ; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" \ + /usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set comm-list $(./comm-list/@) \\$COND\" ; \ fi; " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def index ccac5e10..ada7fd99 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def @@ -2,12 +2,12 @@ type: txt help: "Community number in aa:nn format or local-AS|no-advertise|no-export|internet|additive or none" # TODO: check syntax commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set community $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set community $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set community \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def index ff440e80..4d5efb2c 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def @@ -2,12 +2,12 @@ type: ipv4 help: "Next hop IP address" # TODO: can also set to peer for BGP commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set ip next-hop $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set ip next-hop $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set ip next-hop \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def index 929adaf1..e54fd2c6 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def @@ -1,12 +1,12 @@ type: u32 help: "BGP local preference path attribute" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set local-preference $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set local-preference $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set local-preference \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def index 47a19621..3a580a77 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def @@ -2,12 +2,12 @@ type: txt help: "Metric value for destination routing protocol" syntax: exec "if [ -n `echo $(@) | sed 's/[+0123456789]*-*//g'` ]; then exit 1; fi; "; "metric must be an integer with an optional +/- prepend" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set metric $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set metric $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set metric \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def index 46c33586..10a9de68 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def @@ -2,12 +2,12 @@ type: txt help: "BGP origin code" syntax: $(@) in "igp", "egp", "incomplete"; "origin must be one of igp, egp, or incomplete" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set origin $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set origin $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set origin \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def index ae749c15..05dec8a3 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def @@ -1,12 +1,12 @@ type: ipv4 help: "BGP originator ID attribute" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set originator-id $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set originator-id $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set originator-id \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def index a0812733..d694df35 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def @@ -2,12 +2,12 @@ type: u32 help: "Tag value for routing protocol" syntax: $(@) >= 1 && $(@) <= 65535; "tag must be between 1 and 65535" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set tag $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set tag $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set tag \" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def index 34fed745..b899a45b 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def @@ -1,12 +1,12 @@ type: u32 help: "BGP weight for routing table" commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set weight $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"set weight $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ -c \"no set weight \" " diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index df0e79a6..f1e60caa 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" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c\"router bgp $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c\"no router bgp $(@)\" " +create: "/usr/bin/vtysh -c \"configure terminal\" -c\"router bgp $(@)\" " +delete: "/usr/bin/vtysh -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 b21ef1b5..63c6fe0c 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; "aggregate-entry must be and IPv4 network" 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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ +end: "/usr/bin/vtysh -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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" if [ -n \"$(./summary-only/@)\" ]; then \ COND=\"\\$COND summary-only\"; \ fi; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ + /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ -c \"aggregate-address $(@) \\$COND\"; \ fi; " diff --git a/templates/protocols/bgp/node.tag/bgp/always-compare-med/node.def b/templates/protocols/bgp/node.tag/bgp/always-compare-med/node.def index 007de903..12bb0626 100644 --- a/templates/protocols/bgp/node.tag/bgp/always-compare-med/node.def +++ b/templates/protocols/bgp/node.tag/bgp/always-compare-med/node.def @@ -1,5 +1,5 @@ help: "Allow comparing MED from different neighbors" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp always-compare-med\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no bgp always-compare-med\" " diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/confed/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/confed/node.def index 7bc02046..fe3378e1 100644 --- a/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/confed/node.def +++ b/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/confed/node.def @@ -1,6 +1,6 @@ help: "Compare path lengths including confederation sets & sequences in selecting a route" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ -c \"bgp bestpath as-path confed \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ -c \"no bgp bestpath as-path confed \" " diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/ignore/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/ignore/node.def index 5e12c44a..7acd88b6 100644 --- a/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/ignore/node.def +++ b/templates/protocols/bgp/node.tag/bgp/bestpath/as-path/ignore/node.def @@ -1,5 +1,5 @@ help: "Ignore as-path length in selecting a route" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ -c \"bgp bestpath as-path ignore \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ -c \"no bgp bestpath as-path ignore \" " diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/compare-routerid/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/compare-routerid/node.def index 19d69ddb..e698b9ff 100644 --- a/templates/protocols/bgp/node.tag/bgp/bestpath/compare-routerid/node.def +++ b/templates/protocols/bgp/node.tag/bgp/bestpath/compare-routerid/node.def @@ -1,6 +1,6 @@ help: "Compare router-id for identical EBGP paths" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp bestpath compare-routerid \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no bgp bestpath compare-routerid \" " diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/med/confed/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/med/confed/node.def index 42a64027..0b787b53 100644 --- a/templates/protocols/bgp/node.tag/bgp/bestpath/med/confed/node.def +++ b/templates/protocols/bgp/node.tag/bgp/bestpath/med/confed/node.def @@ -1,6 +1,6 @@ help: "Compare MED among confederation paths" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ -c \"bgp bestpath med confed \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ -c \"no bgp bestpath med confed \" " diff --git a/templates/protocols/bgp/node.tag/bgp/bestpath/med/missing-as-worst/node.def b/templates/protocols/bgp/node.tag/bgp/bestpath/med/missing-as-worst/node.def index 5a6f571a..274cc138 100644 --- a/templates/protocols/bgp/node.tag/bgp/bestpath/med/missing-as-worst/node.def +++ b/templates/protocols/bgp/node.tag/bgp/bestpath/med/missing-as-worst/node.def @@ -1,6 +1,6 @@ help: "Treat missing MED as the least preferred one" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ -c \"bgp bestpath med missing-as-worst \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../@)\" \ -c \"no bgp bestpath med missing-as-worst \" " diff --git a/templates/protocols/bgp/node.tag/bgp/client-to-client-reflection/node.def b/templates/protocols/bgp/node.tag/bgp/client-to-client-reflection/node.def index 00b4ef71..8722f7b5 100644 --- a/templates/protocols/bgp/node.tag/bgp/client-to-client-reflection/node.def +++ b/templates/protocols/bgp/node.tag/bgp/client-to-client-reflection/node.def @@ -1,6 +1,6 @@ help: "Configure client to client route reflection" # TODO: not showing up in vyatta. Probably needs another setting to be applied. -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp client-to-client reflection \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no bgp client-to-client reflection \" " diff --git a/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def b/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def index 741d3761..ba15ece1 100644 --- a/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def +++ b/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def @@ -1,8 +1,8 @@ type: ipv4; "protocols bgp $(../../) cluster-id must be and IPv4 address" help: "Configure route-reflector cluster-id\n" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp cluster-id $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp cluster-id $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no bgp cluster-id \" " diff --git a/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def b/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def index eadc9fc9..eee4fa65 100644 --- a/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def +++ b/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def @@ -1,9 +1,9 @@ type: u32; "protocols bgp $(../../../) confederation identifier must be a u32" help: "Configure confederation AS id" syntax: $(@) >= 1 && $(@) <= 65535; "confederation AS id must be between 1 and 65535" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp confederation identifier $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp confederation identifier $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no bgp confederation identifier \" " diff --git a/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def b/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def index e8c9b7dd..4f28ec13 100644 --- a/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def +++ b/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def @@ -2,9 +2,9 @@ multi: type: u32; "protocols bgp $(../../../@) confederation peer must be a u32" help: "Peer ASs in BGP confederation" syntax: $(@) >= 1 && $(@) <= 65535; "confederation AS id must be between 1 and 65535" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp confederation peers $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp confederation peers $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no bgp confederation peers $(@)\" " diff --git a/templates/protocols/bgp/node.tag/bgp/dampening/node.def b/templates/protocols/bgp/node.tag/bgp/dampening/node.def index 9086f275..987c30c4 100644 --- a/templates/protocols/bgp/node.tag/bgp/dampening/node.def +++ b/templates/protocols/bgp/node.tag/bgp/dampening/node.def @@ -1,12 +1,12 @@ help: "Enable route-flap dampening" delete: "touch /tmp/bgp-dampening.\\$PPID" end: "sh -c \" - /opt/vyatta/bin/vtysh -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \ + /usr/bin/vtysh -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \ -c \\\"no bgp dampening\\\" ; \ if [ -f \\\"/tmp/bgp-dampening.\\\\$PPID\\\" ]; then \ rm -f \\\"/tmp/bgp-dampening.\\\\$PPID\\\" ; \ else \ - /opt/vyatta/bin/vtysh -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \ + /usr/bin/vtysh -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/bgp/default/local-pref/node.def b/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def index 7b5847cc..7fd57db1 100644 --- a/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def +++ b/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def @@ -1,8 +1,8 @@ type: u32; "protocols bgp $(../../../@) bgp default local-pref must be a u32" help: "local preference (higher=more preferred)" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp default local-preference $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp default local-preference $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no bgp default local-preference\" " diff --git a/templates/protocols/bgp/node.tag/bgp/default/no-ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/bgp/default/no-ipv4-unicast/node.def index 77a49962..42ca23fe 100644 --- a/templates/protocols/bgp/node.tag/bgp/default/no-ipv4-unicast/node.def +++ b/templates/protocols/bgp/node.tag/bgp/default/no-ipv4-unicast/node.def @@ -1,5 +1,5 @@ help: "De-activate ipv4-unicastfor a peer by default" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no bgp default ipv4-unicast\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp default ipv4-unicast\" " diff --git a/templates/protocols/bgp/node.tag/bgp/deterministic-med/node.def b/templates/protocols/bgp/node.tag/bgp/deterministic-med/node.def index de476ada..647bf6ab 100644 --- a/templates/protocols/bgp/node.tag/bgp/deterministic-med/node.def +++ b/templates/protocols/bgp/node.tag/bgp/deterministic-med/node.def @@ -1,5 +1,5 @@ help: "Pick the best-MED path among paths advertised from the neighboring AS" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp deterministic-med \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no bgp deterministic-med \" " diff --git a/templates/protocols/bgp/node.tag/bgp/enforce-first-as/node.def b/templates/protocols/bgp/node.tag/bgp/enforce-first-as/node.def index d54557f4..eefdd8c4 100644 --- a/templates/protocols/bgp/node.tag/bgp/enforce-first-as/node.def +++ b/templates/protocols/bgp/node.tag/bgp/enforce-first-as/node.def @@ -1,5 +1,5 @@ help: "Enforce the first AS for EBGP routes" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp enforce-first-as \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no bgp enforce-first-as \" " diff --git a/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def b/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def index 7a928fba..36e7791b 100644 --- a/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def +++ b/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def @@ -1,9 +1,9 @@ type: u32; "protocols bgp $(../../../@) bgp graceful-restart stalepath-time must be a 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" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp graceful-restart stalepath-time $(@) \" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp graceful-restart stalepath-time $(@) \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no bgp graceful-restart stalepath-time \" " diff --git a/templates/protocols/bgp/node.tag/bgp/log-neighbor-changes/node.def b/templates/protocols/bgp/node.tag/bgp/log-neighbor-changes/node.def index 9ae8ec2f..b8c53306 100644 --- a/templates/protocols/bgp/node.tag/bgp/log-neighbor-changes/node.def +++ b/templates/protocols/bgp/node.tag/bgp/log-neighbor-changes/node.def @@ -1,5 +1,5 @@ help: "Log neighbor up/down and reset reason" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp log-neighbor-changes \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no bgp log-neighbor-changes \" " diff --git a/templates/protocols/bgp/node.tag/bgp/network/import-check/node.def b/templates/protocols/bgp/node.tag/bgp/network/import-check/node.def index 96bae68f..0a8ab6c9 100644 --- a/templates/protocols/bgp/node.tag/bgp/network/import-check/node.def +++ b/templates/protocols/bgp/node.tag/bgp/network/import-check/node.def @@ -1,5 +1,5 @@ help: "Check BGP network route exists in IGP" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"bgp network import-check \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no bgp network import-check \" " diff --git a/templates/protocols/bgp/node.tag/bgp/no-fast-external-failover/node.def b/templates/protocols/bgp/node.tag/bgp/no-fast-external-failover/node.def index de7b3815..8bd23728 100644 --- a/templates/protocols/bgp/node.tag/bgp/no-fast-external-failover/node.def +++ b/templates/protocols/bgp/node.tag/bgp/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" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no bgp fast-external-failover \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp fast-external-failover \" " diff --git a/templates/protocols/bgp/node.tag/bgp/router-id/node.def b/templates/protocols/bgp/node.tag/bgp/router-id/node.def index 5a65143a..9e74bc4f 100644 --- a/templates/protocols/bgp/node.tag/bgp/router-id/node.def +++ b/templates/protocols/bgp/node.tag/bgp/router-id/node.def @@ -1,8 +1,8 @@ type: ipv4; "protocols bgp $(../../@) bgp router-id must be an IPv4 address" help: "Override configured router identifier" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp router-id $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp router-id $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no bgp router-id \" " diff --git a/templates/protocols/bgp/node.tag/bgp/scan-time/node.def b/templates/protocols/bgp/node.tag/bgp/scan-time/node.def index 4b4c8814..d0886846 100644 --- a/templates/protocols/bgp/node.tag/bgp/scan-time/node.def +++ b/templates/protocols/bgp/node.tag/bgp/scan-time/node.def @@ -1,9 +1,9 @@ type: u32; "protocols bgp $(../../@) bgp scan-time must be a u32" syntax: $(@) >= 5 && $(@) <= 60; "scan-time must be between 5 and 60 seconds" help: "Configure background scanner interval" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp scan-time $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"bgp scan-time $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no bgp scan-time \" " diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def index 40095c19..6d25e741 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.def @@ -4,6 +4,6 @@ help: "Specify neighbor router" syntax: exec "/opt/vyatta/sbin/vyatta_bgp.pl --check-peer-name $(@)" # if this neighbor has a text name it is a peer group. setup the peer-group option create: "if [ -n \"`echo $(@) | sed 's/[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}//'`\" ]; then \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c\"router bgp $(../@)\" -c\"neighbor $(@) peer-group\" ; \ + /usr/bin/vtysh -c \"configure terminal\" -c\"router bgp $(../@)\" -c\"neighbor $(@) peer-group\" ; \ fi ; " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c\"router bgp $(../@)\" -c\"no neighbor $(@) \" " +delete: "/usr/bin/vtysh -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 a6487aab..b676b9b3 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 @@ -2,9 +2,9 @@ type: u32 help: "Minimum interval between sending BGP routing updates" syntax: $(@) >= 0 && $(@) <= 600; "remote-as must be between 0 and 600" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) advertisement-interval $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) advertisement-interval $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 4ad43d58..9d8330fb 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,11 +1,11 @@ help: "Accept as-path with my AS present in it." syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" delete: "touch /tmp/bgp-neighbor-$(../@)-allowas-in.\\$PPID" -end: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +end: "/usr/bin/vtysh -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; \ else \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ + /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -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 6981f0d3..b5af19ae 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 @@ -1,7 +1,7 @@ help: "BGP attribute is propagated unchanged to this neighbor" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" delete: "touch /tmp/bgp-neighbor-$(../@)-attribute-unchanged.\\$PPID" -end: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +end: "/usr/bin/vtysh -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; \ @@ -15,6 +15,6 @@ end: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@) if [ -n \"$(./next-hop/@)\" ]; then \ COND=\"\\$COND next-hop \" ; \ fi ; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ + /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -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 41adb3d3..a7b2c9ee 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 @@ -1,7 +1,7 @@ help: "Advertise dynamic capability to this neighbor" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) capability dynamic\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -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 c7844c1d..840ae539 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 @@ -1,6 +1,6 @@ help: "Capability to RECEIVE the ORF to this neighbor" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \ -c \"neighbor $(../../../../@) capability orf prefix-list receive\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \ +delete: "/usr/bin/vtysh -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 1d632fa7..4a038e40 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 @@ -1,6 +1,6 @@ help: "Capability to SEND the ORF to this neighbor" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \ -c \"neighbor $(../../../../@) capability orf prefix-list send\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../../../@)\" \ +delete: "/usr/bin/vtysh -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 235c871f..fcb9b318 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 @@ -1,7 +1,7 @@ help: "Originate default route to this neighbor" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" delete: "touch /tmp/bgp-neighbor-$(../@)-default-originate.\\$PPID" -end: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +end: "/usr/bin/vtysh -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; \ @@ -9,7 +9,7 @@ end: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@) if [ -n \"$(./route-map/@)\" ]; then \ COND=\"route-map $(./route-map/@) \" ; \ fi ; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ + /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -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 22841ba7..c0e5d982 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 @@ -1,7 +1,7 @@ help: "one-hop away EBGP peer using loopback address" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) disable-connected-check\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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/in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/in/node.def index 094880f1..7dc26258 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/in/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/in/node.def @@ -2,10 +2,10 @@ type: u32 help: "Filter incoming updates" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) distribute-list $(@) in\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) distribute-list $(@) in\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) distribute-list $(@) in\" " diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/out/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/out/node.def index 4e809cbf..e7531101 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/out/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/out/node.def @@ -2,10 +2,10 @@ type: u32 help: "Filter outgoing updates" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) distribute-list $(@) out\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) distribute-list $(@) out\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) distribute-list $(@) out\" " 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 af530583..761f5b2a 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 @@ -1,7 +1,7 @@ help: "Do not perform capability negotiation" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) dont-capability-negotiate \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 b2867c51..f5a8623a 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 @@ -2,10 +2,10 @@ type: u32 help: "Allow EBGP neighbors not on directly connected networks" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" syntax: $(@) >=1 && $(@) <= 255; "ebgp-multihop must be btween 1 and 255" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) ebgp-multihop $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) ebgp-multihop $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 0a68deab..9e0ea3a7 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 @@ -1,7 +1,7 @@ help: "Enforce EBGP neighbors perform multihop" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) enforce-multihop \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no neighbor $(../@) enforce-multihop \" " diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/in/node.def index d4e6b963..50ec9ae5 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/in/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/in/node.def @@ -2,10 +2,10 @@ type: txt help: "Filter incoming updates based on AS path" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $(@)\" ";"as-path-list $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) filter-list $(@) in\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) filter-list $(@) in\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) filter-list $(@) in\" " diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/out/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/out/node.def index fa36d5a0..4dbdf659 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/out/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/out/node.def @@ -2,10 +2,10 @@ type: txt help: "Filter outgoing updates" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $(@)\" ";"as-path-list $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) filter-list $(@) out\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) filter-list $(@) out\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) filter-list $(@) out\" " 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 fcc3705e..1843ccb5 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 @@ -6,9 +6,9 @@ syntax: exec " \ echo $(@) doesn\\'t exist on this system ; \ exit 1 ; \ fi ; " -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) interface $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) interface $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 29f9d9f7..953cdf68 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 @@ -1,7 +1,7 @@ help: "Specify a local-as number" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" delete: "touch /tmp/bgp-neighbor-$(../@)-local-as.\\$PPID" -end: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +end: "/usr/bin/vtysh -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; \ @@ -13,6 +13,6 @@ end: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@) if [ -n \"$(./no-prepend/@)\" ]; then \ COND=\"no-prepend \" ; \ fi ; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ + /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) local-as $(./local-as/@) \\$COND \"; \ fi; " 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 c5ee473d..f052465a 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 @@ -1,7 +1,7 @@ help: "Disable the next hop calculation for this neighbor" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) next-hop-self\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 1e3dc69f..7ed991ae 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 @@ -1,6 +1,6 @@ help: "Disable the Address Family for this Neighbor" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no neighbor $(../@) activate \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 2217d559..3b98aef5 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 @@ -1,7 +1,7 @@ help: "Do not send extended community attributes" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) send-community extended\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -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 e1fec957..ef717a1f 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 @@ -1,7 +1,7 @@ help: "Do not send standard community attributes" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) send-community standard\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -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 68ddeabe..7d2beb5e 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 @@ -1,7 +1,7 @@ help: "Override capability negotiation result" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) override-capability\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 48a11bbc..a81ae33a 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 @@ -1,7 +1,7 @@ help: "Don't send open messages to this neighbor" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) passive\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no neighbor $(../@) passive \" " 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 6c94d7b7..5f67e21a 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,9 +5,9 @@ syntax: exec "if [ -n \"`echo $(../@) | sed 's/[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0- exit 1; \ fi; "; "peer-group token may not be specified for a peer-group" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $(../../@) neighbor $(@)\" "; "peer-group $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) peer-group $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) peer-group $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 b16839ce..aaa794cd 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 @@ -2,9 +2,9 @@ type: u32 help: "Neighbor's BGP port" syntax: $(@) >= 1 && $(@) <= 65535; "remote-as must be between 1 and 65535" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) port $(@)\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) port $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no neighbor $(../@) port \" " diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/in/node.def index b257d2b5..22d33d7d 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/in/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/in/node.def @@ -2,10 +2,10 @@ type: txt help: "Filter incoming updates" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) prefix-list $(@) in\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) prefix-list $(@) in\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) prefix-list $(@) in\" " diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/out/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/out/node.def index 6a973c26..93a55c54 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/out/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/out/node.def @@ -2,10 +2,10 @@ type: txt help: "Filter outgoing updates" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) prefix-list $(@) out\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) prefix-list $(@) out\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) prefix-list $(@) out\" " 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 847c49f4..aad03776 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" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) remote-as $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 4b6758b0..2e96dce9 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 @@ -1,7 +1,7 @@ help: "Remove private AS number from outbound updates" syntax: $(../peer-group/@) != "" || $(../remote-as/@) != ""; "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) remove-private-AS \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 f6a1f45e..9c9d5f43 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 @@ -2,10 +2,10 @@ type: txt help: "Route-map to apply to incoming updates" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) route-map $(@) in\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) route-map $(@) in\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) route-map $(@) in\" " 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 f6a1f45e..9c9d5f43 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 @@ -2,10 +2,10 @@ type: txt help: "Route-map to apply to incoming updates" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) route-map $(@) in\" " -update: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"neighbor $(../../@) route-map $(@) in\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -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 5a596518..0e0c7574 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 @@ -1,8 +1,8 @@ help: "Configure a neighbor as Route Reflector client" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: $(../../@) == $(../remote-as/@); "remote-as must equal local-as to be a route-reflector client" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) route-reflector-client \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 ea07fc71..e72291ed 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 @@ -1,7 +1,7 @@ help: "Configure a neighbor as Route Server client" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) route-server-client \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 c155ae09..9012c4a1 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 @@ -1,5 +1,5 @@ help: "Administratively shut down this neighbor" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) shutdown\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 eb0ea4af..e0752fbc 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 @@ -1,7 +1,7 @@ help: "Allow inbound soft reconfiguration for this neighbor" syntax: ($(../../peer-group/@) != "") || ($(../../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"no neighbor $(../../@) soft-reconfiguration inbound \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ +delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \ -c \"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 61aef8c3..c9d34cf4 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 @@ -1,6 +1,6 @@ help: "Strict capability negotiation match" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) strict-capability-match \" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 dbfad7ca..b7b7fc16 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 @@ -1,19 +1,19 @@ help: "BGP per neighbor timers" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" delete: "touch /tmp/bgp-neighbor-$(../@)-timers.\\$PPID" -end: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"no neighbor $(../@) timers \"; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ + /usr/bin/vtysh -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; \ else \ if [ -n \"$(./connect/@)\" ]; then \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ + /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) timers connect $(./connect/@)\" ; \ fi ; \ if [ -n \"$(./keepalive/@)\" ] || [ -n \"$(./holdtime/@)\" ]; then \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ + /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) timers $(./keepalive/@) $(./holdtime/@)\"; \ fi ; \ 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 bdcd3e34..56f14bc4 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 @@ -2,7 +2,7 @@ type: txt help: "Route-map to selectively unsuppress suppressed routes" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) unsuppress-map $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 3870a105..5f88f887 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 @@ -6,7 +6,7 @@ syntax: exec " \ echo $(@) doesn\\'t exist on this system ; \ exit 1 ; \ fi ; " -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) update-source $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 f5904a9b..ef6aa250 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 @@ -2,7 +2,7 @@ type: u32 help: "Set default weight for routes from this neighbor" syntax: ($(../peer-group/@) != "") || ($(../remote-as/@) != ""); "remote-as or peer-group must be specified first" syntax: $(@) >= 1 && $(@) <= 65535; "weight must be between 1 and 65535" -create: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ -c \"neighbor $(../@) weight $(@)\" " -delete: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ +delete: "/usr/bin/vtysh -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 f572df35..c8c14cb6 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 $(@)" syntax: ($(./backdoor/@) != "") && ($(./route-map/@) != ""); "Must specify route-map or backdoor but not both" delete: "touch /tmp/`echo $(@) | sed 's!/!!'`.\\$PPID" -end: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ +end: "/usr/bin/vtysh -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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" if [ -n \"$(./route-map/@)\" ]; then \ COND=\"route-map $(./route-map/@)\"; \ fi; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ + /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ -c \"network $(@) \\$COND\"; \ fi; " diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/node.def index 26573a6f..4059a007 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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ +end: "/usr/bin/vtysh -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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" if [ -n \"$(./route-map/@)\" ]; then \ COND=\"\\$COND route-map $(./route-map/@)\"; \ fi; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ + /usr/bin/vtysh -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 0fc1441c..82d3e753 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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ +end: "/usr/bin/vtysh -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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" if [ -n \"$(./route-map/@)\" ]; then \ COND=\"\\$COND route-map $(./route-map/@)\"; \ fi; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ + /usr/bin/vtysh -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 1ac2bf28..867d940f 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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ +end: "/usr/bin/vtysh -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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" if [ -n \"$(./route-map/@)\" ]; then \ COND=\"\\$COND route-map $(./route-map/@)\"; \ fi; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ + /usr/bin/vtysh -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 619de2ec..cb6aa119 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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ +end: "/usr/bin/vtysh -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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" if [ -n \"$(./route-map/@)\" ]; then \ COND=\"\\$COND route-map $(./route-map/@)\"; \ fi; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ + /usr/bin/vtysh -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 98ff7703..9c66fe93 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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ +end: "/usr/bin/vtysh -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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" if [ -n \"$(./route-map/@)\" ]; then \ COND=\"\\$COND route-map $(./route-map/@)\"; \ fi; \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ + /usr/bin/vtysh -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 bf6da0c7..6cd1937e 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: "/opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ +end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ -c \"no timers bgp\"; \ if [ -f \"/tmp/bgp-timers.\\$PPID\" ]; then \ rm -rf /tmp/bgp-timers.\\$PPID; \ else \ - /opt/vyatta/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ + /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \ -c \"timers bgp $(./keepalive/@) $(./holdtime/@)\"; \ fi; " |