From 25349a1237d0e14cd4c30efc96061b2bf2926d74 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 2 Mar 2009 17:06:26 -0800
Subject: Fix delete of VIF
Syntax is not the same for 'ip link delete'
---
templates/interfaces/ethernet/node.tag/vif/node.def | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'templates')
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index 2166f80..e496a7c 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.def
@@ -5,6 +5,10 @@ syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 a
create: sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
sudo ip link set "$VAR(../@).$VAR(@)" up
/opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on
-delete: sudo ip link delete link "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
+delete: sudo ip link delete "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
comp_help: possible completions:
<0-4094> Set VLAN ID
+
+
+
+
--
cgit v1.2.3
From 1ec704bb9deb6e508d2aa3ff43ab59b145ce1f2d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 2 Mar 2009 17:07:35 -0800
Subject: Rearrange interfaces in priority table
Put physical devices (ethernet, serial, etc) before virtual devices
that get created from those devices (bonding, bridging).
---
templates/priority | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'templates')
diff --git a/templates/priority b/templates/priority
index cb43734..69b4c04 100644
--- a/templates/priority
+++ b/templates/priority
@@ -4,15 +4,15 @@
301 protocols/ospfv3
302 protocols/rip
303 protocols/ripng
-310 interfaces/bonding/node.tag
-320 interfaces/bridge/node.tag
-330 interfaces/ethernet/node.tag
-340 interfaces/tunnel/node.tag
-350 interfaces/adsl/node.tag
-360 interfaces/loopback/node.tag
-370 interfaces/openvpn/node.tag
-480 interfaces/serial/node.tag
-490 interfaces/wirelessmodem/node.tag
+310 interfaces/ethernet/node.tag
+320 interfaces/loopback/node.tag
+330 interfaces/adsl/node.tag
+340 interfaces/serial/node.tag
+350 interfaces/wirelessmodem/node.tag
+360 interfaces/bonding/node.tag
+370 interfaces/bridge/node.tag
+380 interfaces/tunnel/node.tag
+380 interfaces/openvpn/node.tag
400 system
450 protocols/static
470 policy
@@ -74,4 +74,4 @@
900 content-inspection
900 load-balancing
900 service
-900 protocols
\ No newline at end of file
+900 protocols
--
cgit v1.2.3