diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-05 15:30:03 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-05 15:30:03 -0800 |
| commit | 7e018e496706667c3c0d9cc074d479b3fc445bd9 (patch) | |
| tree | 94635b213133edb6c3724d0bf7469b5588db386d /templates/protocols/rip/redistribute | |
| parent | 25d3ee90522b1056d9a25735c3e0c89e7b1eeae1 (diff) | |
| download | vyatta-cfg-quagga-7e018e496706667c3c0d9cc074d479b3fc445bd9.tar.gz vyatta-cfg-quagga-7e018e496706667c3c0d9cc074d479b3fc445bd9.zip | |
Get rid of vyatta-vtysh
For SELinux policy, changing vyatta-quagga to use standard path values.
This means not having to change policies.
Diffstat (limited to 'templates/protocols/rip/redistribute')
5 files changed, 10 insertions, 10 deletions
diff --git a/templates/protocols/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def index 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; " |