From 7e018e496706667c3c0d9cc074d479b3fc445bd9 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 5 Mar 2010 15:30:03 -0800
Subject: Get rid of vyatta-vtysh

For SELinux policy, changing vyatta-quagga to use standard path values.
This means not having to change policies.
---
 templates/protocols/rip/timers/node.def | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'templates/protocols/rip/timers/node.def')

diff --git a/templates/protocols/rip/timers/node.def b/templates/protocols/rip/timers/node.def
index db2562b0..51b2cf17 100644
--- a/templates/protocols/rip/timers/node.def
+++ b/templates/protocols/rip/timers/node.def
@@ -1,14 +1,11 @@
 help: Set RIP timer values
-delete:expression: "touch /tmp/rip-timers.$PPID"
-end:expression: "vyatta-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                  \
-        -c \"configure terminal\" -c \"router rip\"       \
-        -c \"timers basic $VAR(./update/@)                \
-                          $VAR(./timeout/@)               \
-                          $VAR(./garbage-collection/@)\"; \
-    fi; "
+
+delete: touch /tmp/rip-timers.$PPID
+
+end: 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
+       vtysh -c "configure terminal" -c "router rip"  \
+             -c "timers basic $VAR(./update/@) $VAR(./timeout/@) $VAR(./garbage-collection/@)"
+    fi
-- 
cgit v1.2.3

