summaryrefslogtreecommitdiff
path: root/templates/interfaces/bridge
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-11-22 10:32:04 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-11-22 11:14:18 -0800
commit39a799dac616edd4b42a1b4de2c861f248318e1f (patch)
tree821d778a77ff75015dba4936ca10652824224ef9 /templates/interfaces/bridge
parentb17d21023482c752c490754a11450d4c41c83607 (diff)
downloadvyatta-cfg-system-39a799dac616edd4b42a1b4de2c861f248318e1f.tar.gz
vyatta-cfg-system-39a799dac616edd4b42a1b4de2c861f248318e1f.zip
Use script vyatta-address to set interface
Avoid the overhead of perl compilation of vyatta-interfaces for each address added. Handle the case of deleting address on deleted device cleanly. Clean up dhcpv6 script so it can be used on interfaces other than ethernet.
Diffstat (limited to 'templates/interfaces/bridge')
-rw-r--r--templates/interfaces/bridge/node.tag/address/node.def15
1 files changed, 3 insertions, 12 deletions
diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def
index cb08069e..45aa03e2 100644
--- a/templates/interfaces/bridge/node.tag/address/node.def
+++ b/templates/interfaces/bridge/node.tag/address/node.def
@@ -5,19 +5,10 @@ help: IP address
syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"
-create: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@)
+create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../@) $VAR(@)
+
+delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../@) $VAR(@)
-delete:
- if /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \
- --bridge-notin-proposedcfg \
- --bridge-interface="$VAR(../@)"; then \
- # bridge has higher priority than bridge-address so bridge gets deleted
- # before bridge-address in case the whole of bridge config was deleted.
- # In that case we do not need to delete address here now
- exit 0
- else
- sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)
- fi
allowed: echo "dhcp <>"
val_help: ipv4net; IP address and prefix length