From bb626b99b59133577e333cd2b5553cdc621c4ad7 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 30 Jul 2008 15:28:35 -0700
Subject: Replace calls to vyatta-vtysh perl script with vyatta-vtysh

No longer need the perl wrapper, the logging and error suppression
are now in the command itself. This helps with the speed of route
creation with lots of routes.
---
 scripts/policy/vyatta-policy.pl        | 3 ++-
 scripts/vyatta-policy-action-verify.pl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/policy/vyatta-policy.pl b/scripts/policy/vyatta-policy.pl
index 5e77a322..8fd94843 100755
--- a/scripts/policy/vyatta-policy.pl
+++ b/scripts/policy/vyatta-policy.pl
@@ -3,7 +3,8 @@ use lib "/opt/vyatta/share/perl5/";
 use VyattaConfig;
 use VyattaMisc;
 use Getopt::Long;
-$VTYSH='/opt/vyatta/sbin/vyatta-vtysh.pl';
+
+my $VTYSH='/usr/bin/vyatta-vtysh';
 
 GetOptions("update-access-list=s"    => \$accesslist,
            "update-aspath-list=s"    => \$aspathlist,
diff --git a/scripts/vyatta-policy-action-verify.pl b/scripts/vyatta-policy-action-verify.pl
index 65ee5363..5ddd2974 100644
--- a/scripts/vyatta-policy-action-verify.pl
+++ b/scripts/vyatta-policy-action-verify.pl
@@ -55,5 +55,5 @@ foreach my $qualifiers (@qualifiers) {
 #need to get a count of what's left and if action is deleted, but other nodes are present then reject
     
 if (-e "/tmp/delete-policy-route-map-$route_map-rule-$rule") {
-    system "/opt/vyatta/sbin/vyatta-vtysh.pl -c \"configure terminal\" -c \"no route-map $route_map $action $rule\"";
+    system "/usr/bin/vyatta-vtysh -c \"configure terminal\" -c \"no route-map $route_map $action $rule\"";
 }
-- 
cgit v1.2.3