summaryrefslogtreecommitdiff
path: root/templates/interfaces/ethernet
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-07-30 15:26:58 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-07-30 15:26:58 -0700
commitc97f9d4375f4527001762cde625c96b2cc516dc8 (patch)
tree47077f75306d0219de592f169552bc897bf2bf17 /templates/interfaces/ethernet
parentf5553dcfb12f600dad8f766be887e9cd18d68847 (diff)
downloadvyatta-cfg-c97f9d4375f4527001762cde625c96b2cc516dc8.tar.gz
vyatta-cfg-c97f9d4375f4527001762cde625c96b2cc516dc8.zip
Use vtysh directly
No longer need the perl wrapper for vtysh. The options and logging have been folded into it.
Diffstat (limited to 'templates/interfaces/ethernet')
-rw-r--r--templates/interfaces/ethernet/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.def2
2 files changed, 2 insertions, 2 deletions
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(../@)"