From c97f9d4375f4527001762cde625c96b2cc516dc8 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 30 Jul 2008 15:26:58 -0700
Subject: Use vtysh directly

No longer need the perl wrapper for vtysh. The options and logging
have been folded into it.
---
 templates/interfaces/ethernet/node.def              | 2 +-
 templates/interfaces/ethernet/node.tag/vif/node.def | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def
index 1049f3e..1c52675 100644
--- a/templates/interfaces/ethernet/node.def
+++ b/templates/interfaces/ethernet/node.def
@@ -7,7 +7,7 @@ syntax:expression: exec " \
           exit 1 ; \
         fi ; "
 update:expression: "sudo ip link set $VAR(@) up" ; "Error enabling dev $VAR(@)"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(@)\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(@)\" \
           -c \"link-detect\"; "
 delete:expression: "sudo ip link set $VAR(@) down" ; "Error disabling dev $VAR(@)"
 allowed: for dev in /sys/class/net/*; 
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index 7ee3b50..e38b6b2 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.def
@@ -5,7 +5,7 @@ syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 a
 create:expression: "sudo modprobe 8021q"; "Error loading 802.1q driver"
 create:expression: "sudo vconfig add $VAR(../@) $VAR(@)"; "Error adding VLAN id $VAR(@) to dev $VAR(../@)"
 create:expression: "sudo ip link set $VAR(../@).$VAR(@) up"; "Error enabling VLAN id $VAR(@) on dev $VAR(../@)"
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"\
+create:expression: "vyatta-vtysh -c \"configure terminal\"\
           -c \"interface $VAR(../@).$VAR(@)\" \
           -c \"link-detect\"; "
 delete:expression: "sudo vconfig rem $VAR(../@).$VAR(@)"; "Error removing VLAN id $VAR(@) from dev $VAR(../@)"
-- 
cgit v1.2.3