diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-05-21 17:12:27 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-05-21 17:12:27 -0700 |
| commit | 6532ac36bd6b6590edbffc725d7d2fe75dab2c7d (patch) | |
| tree | 48fadc7b732983f9abb6b882af58cafaca52edcf /templates | |
| parent | 81218208adb11e2a8e32b90ede20554cad23c45a (diff) | |
| parent | 613b7e3b36684e92cb7765b03bb4706a6caed98b (diff) | |
| download | vyatta-cfg-6532ac36bd6b6590edbffc725d7d2fe75dab2c7d.tar.gz vyatta-cfg-6532ac36bd6b6590edbffc725d7d2fe75dab2c7d.zip | |
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg into jenner
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/disable/node.def | 7 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/vif/node.def | 16 |
2 files changed, 7 insertions, 16 deletions
diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def index 3d3ffef..ad03336 100644 --- a/templates/interfaces/ethernet/node.tag/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/disable/node.def @@ -1,10 +1,5 @@ help: Set interface disabled -create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show=all` - if [ ! -z "$vif" ]; then - echo "Can not disable interface " $VAR(../@) " with vif:" $vif - exit 1 - fi - /etc/netplug/linkdown.d/dhclient $VAR(../@) +create: /etc/netplug/linkdown.d/dhclient $VAR(../@) if ! sudo ip link set $VAR(../@) down 2>/dev/null; then echo "Error disabling dev $VAR(../@)" /etc/netplug/linkup.d/dhclient $VAR(../@) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def index bca6307..dabfa56 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.def @@ -2,19 +2,15 @@ tag: type: u32 help: Set Virtual Local Area Network (VLAN) ID syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" -create: read flags < /sys/class/net/$VAR(../@)/flags - if [ $(( flags & 1 )) -eq 0 ] +create: if ! sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) + then echo "Error creating VLAN device $VAR(../@).$VAR(@)" + exit 1 + fi + if /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) --isup then - echo "Can not create VLAN on disabled interface: " $VAR(../@) - exit 1 + sudo ip link set "$VAR(../@).$VAR(@)" up fi - sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1 - sudo ip link set "$VAR(../@).$VAR(@)" up /opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on delete: sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@) comp_help: possible completions: <0-4094> Set VLAN ID - - - - |