summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2011-06-16 13:27:12 -0400
committerStephen Hemminger <stephen.hemminger@vyatta.com>2011-06-16 13:27:12 -0400
commit4729a33cdf054cce6780aa4817f9eaccb490ee3f (patch)
tree7277aa2a1a5b9dad010f79b33d508060a2df19a6
parenta7edd2ee3c5ab5cd11a4ebe9cdbd5772253a1fd4 (diff)
downloadvyatta-cfg-system-4729a33cdf054cce6780aa4817f9eaccb490ee3f.tar.gz
vyatta-cfg-system-4729a33cdf054cce6780aa4817f9eaccb490ee3f.zip
bonding: remove requirement of slaves existing before vif
Bug 5383 Kernel modified to not default to vlan challenged, therefore it is now okay to make vlan on empty bond
-rw-r--r--templates/interfaces/bonding/node.tag/vif/node.def7
1 files changed, 1 insertions, 6 deletions
diff --git a/templates/interfaces/bonding/node.tag/vif/node.def b/templates/interfaces/bonding/node.tag/vif/node.def
index 35a00835..356bd076 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.def
@@ -5,12 +5,7 @@ help: Virtual Local Area Network (VLAN) ID
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
val_help: u32:0-4094; VLAN ID
-create: read -a SLAVES </sys/class/net/$VAR(../@)/bonding/slaves
- if [ ${#SLAVES[*]} -eq 0 ]; then
- echo "Must configure slave devices for bond interface $VAR(../@) before adding vif"
- exit 1
- fi
- ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1
+create: ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1
ip link set "$VAR(../@).$VAR(@)" up
sudo sh -c "/opt/vyatta/sbin/vyatta-link-detect $VAR(../@).$VAR(@) on"