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.
---
 .../static/interface-route/node.tag/next-hop-interface/node.def     | 6 +++---
 .../static/interface-route6/node.tag/next-hop-interface/node.def    | 6 +++---
 templates/protocols/static/route/node.tag/blackhole/node.def        | 4 ++--
 templates/protocols/static/route/node.tag/next-hop/node.def         | 6 +++---
 templates/protocols/static/route6/node.tag/blackhole/node.def       | 4 ++--
 templates/protocols/static/route6/node.tag/next-hop/node.def        | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'templates/protocols/static')

diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
index 386874ec..7c0a0299 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
@@ -11,17 +11,17 @@ end:
   then
     if [[ ${COMMIT_ACTION} = 'DELETE' ]]
     then
-      vyatta-vtysh -c "configure terminal" \
+      vtysh -c "configure terminal" \
                    -c "no ip route $VAR(../@) $VAR(@)"
     else
       if [[ -n "$VAR(./distance/@)" ]]
       then
         DIST="$VAR(./distance/@)"
       fi
-      vyatta-vtysh -c "configure terminal" \
+      vtysh -c "configure terminal" \
                    -c "ip route $VAR(../@) $VAR(@) $DIST";
     fi
   else
-      vyatta-vtysh -c "configure terminal" \
+      vtysh -c "configure terminal" \
                    -c "no ip route $VAR(../@) $VAR(@)"
   fi
diff --git a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
index 4f23fc35..666abca0 100644
--- a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
@@ -10,17 +10,17 @@ end:
   then
     if [[ ${COMMIT_ACTION} = 'DELETE' ]]
     then
-      vyatta-vtysh -c "configure terminal" \
+      vtysh -c "configure terminal" \
                    -c "no ipv6 route $VAR(../@) $VAR(@)"
     else
       if [[ -n "$VAR(./distance/@)" ]]
       then
         DIST="$VAR(./distance/@)"
       fi
-      vyatta-vtysh -c "configure terminal" \
+      vtysh -c "configure terminal" \
                    -c "ipv6 route $VAR(../@) $VAR(@) $DIST";
     fi
   else
-      vyatta-vtysh -c "configure terminal" \
+      vtysh -c "configure terminal" \
                    -c "no ipv6 route $VAR(../@) $VAR(@)"
   fi
diff --git a/templates/protocols/static/route/node.tag/blackhole/node.def b/templates/protocols/static/route/node.tag/blackhole/node.def
index 14375e0e..b2272e68 100644
--- a/templates/protocols/static/route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route/node.tag/blackhole/node.def
@@ -1,12 +1,12 @@
 help: Set to silently discard pkts when matched
 
 end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then
-       vyatta-vtysh -c "configure terminal" \
+       vtysh -c "configure terminal" \
                     -c "no ip route $VAR(../@) null0";
      else
        if [ -n "$VAR(./distance/@)" ]; then
 	 DIST="$VAR(./distance/@)";
        fi;
-       vyatta-vtysh -c "configure terminal" \
+       vtysh -c "configure terminal" \
                     -c "ip route $VAR(../@) null0 $DIST";
      fi;
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.def b/templates/protocols/static/route/node.tag/next-hop/node.def
index f3119da1..e0cb6862 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.def
@@ -9,7 +9,7 @@ end:
       if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \
           "$VAR(../@)" "$VAR(@)"
       then 
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
                      -c "no ip route $VAR(../@) $VAR(@)"
       fi
     else
@@ -17,14 +17,14 @@ end:
       then
 	 	    DIST="$VAR(./distance/@)"
       fi
-	    vyatta-vtysh -c "configure terminal" \
+	    vtysh -c "configure terminal" \
                    -c "ip route $VAR(../@) $VAR(@) $DIST";
     fi
   else
     if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \
         "$VAR(../@)" "$VAR(@)"
     then
-      vyatta-vtysh -c "configure terminal" \
+      vtysh -c "configure terminal" \
                    -c "no ip route $VAR(../@) $VAR(@)"
     fi
   fi
diff --git a/templates/protocols/static/route6/node.tag/blackhole/node.def b/templates/protocols/static/route6/node.tag/blackhole/node.def
index a4066ee6..24b15560 100644
--- a/templates/protocols/static/route6/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route6/node.tag/blackhole/node.def
@@ -1,12 +1,12 @@
 help: Set to silently discard pkts when matched
 
 end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then 
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "no ipv6 route $VAR(../@) null0";
      else
         if [ -n "$VAR(./distance/@)" ]; then
 	   DIST="$VAR(./distance/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "ipv6 route $VAR(../@) null0 $DIST";
      fi;
diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def
index 3f90e757..4d123637 100644
--- a/templates/protocols/static/route6/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route6/node.tag/next-hop/node.def
@@ -9,7 +9,7 @@ end:
       if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \
           "$VAR(../@)" "$VAR(@)"
       then
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
                      -c "no ipv6 route $VAR(../@) $VAR(@)"
       fi
     else
@@ -23,14 +23,14 @@ end:
         INTERFACE="$VAR(./interface/@)"
       fi
 
-      vyatta-vtysh -c "configure terminal" \
+      vtysh -c "configure terminal" \
                    -c "ipv6 route $VAR(../@) $VAR(@) $INTERFACE $DIST";
     fi
   else
     if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \
         "$VAR(../@)" "$VAR(@)"
     then
-      vyatta-vtysh -c "configure terminal" \
+      vtysh -c "configure terminal" \
                    -c "no ipv6 route $VAR(../@) $VAR(@)"
     fi
   fi
-- 
cgit v1.2.3