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.
---
 scripts/policy/vyatta-policy.pl        | 2 +-
 scripts/vyatta-link-detect             | 4 ++--
 scripts/vyatta-policy-action-verify.pl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/policy/vyatta-policy.pl b/scripts/policy/vyatta-policy.pl
index a91d606b..08dc3b93 100755
--- a/scripts/policy/vyatta-policy.pl
+++ b/scripts/policy/vyatta-policy.pl
@@ -5,7 +5,7 @@ use Vyatta::Config;
 use Vyatta::Misc;
 use Getopt::Long;
 
-my $VTYSH = '/usr/bin/vyatta-vtysh';
+my $VTYSH = '/usr/bin/vtysh';
 
 my ( $accesslist, $accesslist6, $aspathlist, $communitylist, $peer );
 my ( $routemap, $deleteroutemap );
diff --git a/scripts/vyatta-link-detect b/scripts/vyatta-link-detect
index af392549..9dc17e05 100755
--- a/scripts/vyatta-link-detect
+++ b/scripts/vyatta-link-detect
@@ -24,10 +24,10 @@ set-sysctl () {
 
 case $2 in
 on)	set-sysctl $1 2
-	exec vyatta-vtysh -c "configure terminal" -c "interface $1" \
+	exec vtysh -c "configure terminal" -c "interface $1" \
 	    -c "link-detect" ;;
 off)    set-sysctl $1 1
-	exec vyatta-vtysh -c "configure terminal" -c "interface $1" \
+	exec vtysh -c "configure terminal" -c "interface $1" \
 	    -c "no link-detect" ;;
 *)	usage;;
 esac
diff --git a/scripts/vyatta-policy-action-verify.pl b/scripts/vyatta-policy-action-verify.pl
index b914837e..61b39482 100755
--- a/scripts/vyatta-policy-action-verify.pl
+++ b/scripts/vyatta-policy-action-verify.pl
@@ -52,5 +52,5 @@ foreach my $qualifiers (@qualifiers) {
 
 if ( -e "/tmp/delete-policy-route-map-$route_map-rule-$rule" ) {
     system
-"/usr/bin/vyatta-vtysh -c \"configure terminal\" -c \"no route-map $route_map $action $rule\"";
+"/usr/bin/vtysh -c \"configure terminal\" -c \"no route-map $route_map $action $rule\"";
 }
-- 
cgit v1.2.3