From 588492cf8a9ddf438b649c6db4986bcab9c22435 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 11 Aug 2008 18:39:24 -0700 Subject: Replace vyatta-vtysh with vtysh --- templates/protocols/rip/default-distance/node.def | 4 ++-- templates/protocols/rip/default-information/originate/node.def | 4 ++-- templates/protocols/rip/default-metric/node.def | 4 ++-- templates/protocols/rip/distribute-list/access-list/in/node.def | 4 ++-- templates/protocols/rip/distribute-list/access-list/out/node.def | 4 ++-- .../distribute-list/interface/node.tag/access-list/in/node.def | 4 ++-- .../distribute-list/interface/node.tag/access-list/out/node.def | 4 ++-- .../distribute-list/interface/node.tag/prefix-list/in/node.def | 4 ++-- .../distribute-list/interface/node.tag/prefix-list/out/node.def | 4 ++-- templates/protocols/rip/distribute-list/prefix-list/in/node.def | 4 ++-- templates/protocols/rip/distribute-list/prefix-list/out/node.def | 4 ++-- templates/protocols/rip/interface/node.def | 4 ++-- templates/protocols/rip/neighbor/node.def | 4 ++-- templates/protocols/rip/network-distance/node.def | 4 ++-- templates/protocols/rip/network/node.def | 4 ++-- templates/protocols/rip/node.def | 4 ++-- templates/protocols/rip/passive-interface/node.def | 8 ++++---- templates/protocols/rip/redistribute/bgp/node.def | 4 ++-- templates/protocols/rip/redistribute/connected/node.def | 4 ++-- templates/protocols/rip/redistribute/kernel/node.def | 4 ++-- templates/protocols/rip/redistribute/ospf/node.def | 4 ++-- templates/protocols/rip/redistribute/static/node.def | 4 ++-- templates/protocols/rip/route/node.def | 4 ++-- templates/protocols/rip/timers/node.def | 4 ++-- 24 files changed, 50 insertions(+), 50 deletions(-) (limited to 'templates/protocols/rip') diff --git a/templates/protocols/rip/default-distance/node.def b/templates/protocols/rip/default-distance/node.def index 79df4021..5b7996e6 100644 --- a/templates/protocols/rip/default-distance/node.def +++ b/templates/protocols/rip/default-distance/node.def @@ -1,8 +1,8 @@ type: u32 help: Set administrative distance syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distance $VAR(@) \" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distance $VAR(@) \" " comp_help: Enter a distance valude between 1-255 diff --git a/templates/protocols/rip/default-information/originate/node.def b/templates/protocols/rip/default-information/originate/node.def index 0eeb3d30..9ecbe683 100644 --- a/templates/protocols/rip/default-information/originate/node.def +++ b/templates/protocols/rip/default-information/originate/node.def @@ -1,6 +1,6 @@ help: Set to distribute a default route -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"default-information originate\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no default-information originate\" " diff --git a/templates/protocols/rip/default-metric/node.def b/templates/protocols/rip/default-metric/node.def index fb1faee8..ea1ceb77 100644 --- a/templates/protocols/rip/default-metric/node.def +++ b/templates/protocols/rip/default-metric/node.def @@ -1,8 +1,8 @@ type: u32 help: Set metric of redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"default-metric $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no default-metric $VAR(@) \"; " #comp_help <1-16> Default metric diff --git a/templates/protocols/rip/distribute-list/access-list/in/node.def b/templates/protocols/rip/distribute-list/access-list/in/node.def index c4b42975..124705b2 100644 --- a/templates/protocols/rip/distribute-list/access-list/in/node.def +++ b/templates/protocols/rip/distribute-list/access-list/in/node.def @@ -1,8 +1,8 @@ type: u32 help: Set access-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list $VAR(@) in\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list $VAR(@) in\" " diff --git a/templates/protocols/rip/distribute-list/access-list/out/node.def b/templates/protocols/rip/distribute-list/access-list/out/node.def index e6e21860..77810a46 100644 --- a/templates/protocols/rip/distribute-list/access-list/out/node.def +++ b/templates/protocols/rip/distribute-list/access-list/out/node.def @@ -1,8 +1,8 @@ type: u32 help: Set access-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list $VAR(@) out\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list $VAR(@) out\" " diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def index 6f5950fe..ac16b25f 100644 --- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def +++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def @@ -1,8 +1,8 @@ type: u32 help: Set access-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list $VAR(@) in $VAR(../../@)\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list $VAR(@) in $VAR(../../@)\" " diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def index db795ea7..8f58be0f 100644 --- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def +++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def @@ -1,7 +1,7 @@ type: u32 help: Set access-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list $VAR(@) out $VAR(../../@) \" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list $VAR(@) out $VAR(../../@) \" " diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def index 73ba0933..4dbe19c4 100644 --- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def +++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def @@ -1,7 +1,7 @@ type: txt help: Set prefix-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list prefix $VAR(@) in $VAR(../../@) \" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list prefix $VAR(@) in $VAR(../../@) \" " diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def index 753fda2b..51707b0f 100644 --- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def +++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def @@ -1,7 +1,7 @@ type: txt help: Set prefix-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list prefix $VAR(@) out $VAR(../../@) \" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list prefix $VAR(@) out $VAR(../../@)\" " diff --git a/templates/protocols/rip/distribute-list/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/prefix-list/in/node.def index 31e3afad..89f95bcb 100644 --- a/templates/protocols/rip/distribute-list/prefix-list/in/node.def +++ b/templates/protocols/rip/distribute-list/prefix-list/in/node.def @@ -1,8 +1,8 @@ type: txt help: Set prefix-list to apply to input packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list prefix $VAR(@) in\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list prefix $VAR(@) in\" " diff --git a/templates/protocols/rip/distribute-list/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/prefix-list/out/node.def index c6278ee1..598eeaa5 100644 --- a/templates/protocols/rip/distribute-list/prefix-list/out/node.def +++ b/templates/protocols/rip/distribute-list/prefix-list/out/node.def @@ -1,7 +1,7 @@ type: txt help: Set prefix-list to apply to output packets commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist" -update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distribute-list prefix $VAR(@) out\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distribute-list prefix $VAR(@) out\" " diff --git a/templates/protocols/rip/interface/node.def b/templates/protocols/rip/interface/node.def index 8a1e560e..a8fa41f9 100644 --- a/templates/protocols/rip/interface/node.def +++ b/templates/protocols/rip/interface/node.def @@ -6,8 +6,8 @@ syntax:expression: exec " \ echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \ exit 1 ; \ fi ; " -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" -c \"network $VAR(@)\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" -c \"no network $VAR(@)\" " +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" -c \"network $VAR(@)\" " +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" -c \"no network $VAR(@)\" " allowed: local -a array; array=( /sys/class/net/{eth,vmnet}* ) ; echo -n ${array[@]##*/} diff --git a/templates/protocols/rip/neighbor/node.def b/templates/protocols/rip/neighbor/node.def index 43e98ba4..f9359405 100644 --- a/templates/protocols/rip/neighbor/node.def +++ b/templates/protocols/rip/neighbor/node.def @@ -1,8 +1,8 @@ multi: type: ipv4 help: Set a neighbor router -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"neighbor $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no neighbor $VAR(@)\"; " diff --git a/templates/protocols/rip/network-distance/node.def b/templates/protocols/rip/network-distance/node.def index 9ec05222..74be87b8 100644 --- a/templates/protocols/rip/network-distance/node.def +++ b/templates/protocols/rip/network-distance/node.def @@ -9,10 +9,10 @@ end:expression: "if [ -n \"$VAR(./access-list/@)\" ]; then \ fi; \ if [ -f \"/tmp/rip-dist.$PPID\" ]; then \ dist=$(cat /tmp/rip-network-distance.$PPID); \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no distance $dist $VAR(@) $ACL \" ; rm -f \"/tmp/rip-dist.$PPID\"; else \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"distance $VAR(./distance/@) $VAR(@) $ACL \" ; fi; " diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def index 483173a4..82ee17be 100644 --- a/templates/protocols/rip/network/node.def +++ b/templates/protocols/rip/network/node.def @@ -2,7 +2,7 @@ multi: type: ipv4net help: Set RIP network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"network $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no network $VAR(@)\"; " diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def index 38d3da1a..f6f7b718 100644 --- a/templates/protocols/rip/node.def +++ b/templates/protocols/rip/node.def @@ -1,4 +1,4 @@ help: Configure Routing Information Protocol (RIP) parameters -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"no router rip\" " +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" " +delete:expression: "vtysh -c \"configure terminal\" -c \"no router rip\" " diff --git a/templates/protocols/rip/passive-interface/node.def b/templates/protocols/rip/passive-interface/node.def index 1663df1b..a23ecf4f 100644 --- a/templates/protocols/rip/passive-interface/node.def +++ b/templates/protocols/rip/passive-interface/node.def @@ -7,17 +7,17 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " update:expression: "if [ x$VAR(x) == xdefault ]; then \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"passive-interface default\"; \ else \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"passive-interface $VAR(@)\"; \ fi; " delete:expression: "if [ x$VAR(x) == xdefault ]; then \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no passive-interface default\"; \ else \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no passive-interface $VAR(@)\"; \ fi; " allowed: local -a array; diff --git a/templates/protocols/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def index ac9076ab..1ac42adb 100644 --- a/templates/protocols/rip/redistribute/bgp/node.def +++ b/templates/protocols/rip/redistribute/bgp/node.def @@ -1,6 +1,6 @@ help: Set to redistribute BGP routes delete:expression: "touch /tmp/rip-redist-bgp.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute bgp \"; \ if [ -f \"/tmp/rip-redist-bgp.$PPID\" ]; then \ rm -rf /tmp/rip-redist-bgp.$PPID; \ @@ -11,6 +11,6 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute bgp $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/connected/node.def b/templates/protocols/rip/redistribute/connected/node.def index 1ad349ac..4bd5c8c3 100644 --- a/templates/protocols/rip/redistribute/connected/node.def +++ b/templates/protocols/rip/redistribute/connected/node.def @@ -1,6 +1,6 @@ help: Set to redistribute connected routes delete:expression: "touch /tmp/rip-redist-connected.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute connected \"; \ if [ -f \"/tmp/rip-redist-connected.$PPID\" ]; then \ rm -rf /tmp/rip-redist-connected.$PPID; \ @@ -11,6 +11,6 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute connected $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/kernel/node.def b/templates/protocols/rip/redistribute/kernel/node.def index 689dcfe5..d7ef7420 100644 --- a/templates/protocols/rip/redistribute/kernel/node.def +++ b/templates/protocols/rip/redistribute/kernel/node.def @@ -1,6 +1,6 @@ help: Set to redistribute kernel routes delete:expression: "touch /tmp/rip-redist-kernel.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute kernel \"; \ if [ -f \"/tmp/rip-redist-kernel.$PPID\" ]; then \ rm -rf /tmp/rip-redist-kernel.$PPID; \ @@ -11,6 +11,6 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute kernel $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/ospf/node.def b/templates/protocols/rip/redistribute/ospf/node.def index bad996cb..8c97dba9 100644 --- a/templates/protocols/rip/redistribute/ospf/node.def +++ b/templates/protocols/rip/redistribute/ospf/node.def @@ -1,6 +1,6 @@ help: Set to redistribute OSPF routes delete:expression: "touch /tmp/rip-redist-ospf.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute ospf \"; \ if [ -f \"/tmp/rip-redist-ospf.$PPID\" ]; then \ rm -rf /tmp/rip-redist-ospf.$PPID; \ @@ -11,7 +11,7 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute ospf $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/static/node.def b/templates/protocols/rip/redistribute/static/node.def index 384f3735..728bf6f2 100644 --- a/templates/protocols/rip/redistribute/static/node.def +++ b/templates/protocols/rip/redistribute/static/node.def @@ -1,6 +1,6 @@ help: Set to redistribute static routes delete:expression: "touch /tmp/rip-redist-static.$PPID" -end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute static \"; \ if [ -f \"/tmp/rip-redist-static.$PPID\" ]; then \ rm -rf /tmp/rip-redist-static.$PPID; \ @@ -11,6 +11,6 @@ end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ if [ -n \"$VAR(./route-map/@)\" ]; then \ COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ + vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"redistribute static $COND\"; \ fi; " diff --git a/templates/protocols/rip/route/node.def b/templates/protocols/rip/route/node.def index 351e8fc3..81638c9a 100644 --- a/templates/protocols/rip/route/node.def +++ b/templates/protocols/rip/route/node.def @@ -2,8 +2,8 @@ multi: type: ipv4net help: Set RIP static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" -create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"route $VAR(@)\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \ +delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"no route $VAR(@)\" " diff --git a/templates/protocols/rip/timers/node.def b/templates/protocols/rip/timers/node.def index db2562b0..26372ec5 100644 --- a/templates/protocols/rip/timers/node.def +++ b/templates/protocols/rip/timers/node.def @@ -1,12 +1,12 @@ help: Set RIP timer values delete:expression: "touch /tmp/rip-timers.$PPID" -end:expression: "vyatta-vtysh \ +end:expression: "vtysh \ -c \"configure terminal\" -c \"router rip\" \ -c \"no timers basic\"; \ if [ -f \"/tmp/rip-timers.$PPID\" ]; then \ rm -rf /tmp/rip-timers.$PPID; \ else \ - vyatta-vtysh \ + vtysh \ -c \"configure terminal\" -c \"router rip\" \ -c \"timers basic $VAR(./update/@) \ $VAR(./timeout/@) \ -- cgit v1.2.3