diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-08-11 12:51:34 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-08-11 12:51:34 -0500 |
| commit | 27a86abba8ab1aee64b0b1596e0d87df3ab371cb (patch) | |
| tree | af30be01c2a375df4fa5c4fcc2ef36adc0a10a18 | |
| parent | 696972c4d2089979fbfc884a9c03a6d2dae5bd25 (diff) | |
| parent | 676fbdb31cc3164125574db985ddfea790652451 (diff) | |
| download | vyatta-cfg-quagga-27a86abba8ab1aee64b0b1596e0d87df3ab371cb.tar.gz vyatta-cfg-quagga-27a86abba8ab1aee64b0b1596e0d87df3ab371cb.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into oxnard
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | templates/interfaces/bridge/node.def | 4 | ||||
| -rw-r--r-- | templates/interfaces/bridge/node.tag/mac/node.def | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1ac5eb5d..5e4251db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.19.110) unstable; urgency=low + + * bridge: allow setting mac address + + -- Stephen Hemminger <shemminger@vyatta.com> Mon, 08 Aug 2011 16:43:34 -0700 + vyatta-cfg-system (0.19.109) unstable; urgency=low * 0.19.108 diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index 9deaa0a4..c20b361c 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -6,6 +6,9 @@ val_help: <brN>; Bridge interface name syntax:expression: pattern $VAR(@) "^br[0-9]+$" ; "Must be (br0 - br999)" create: /usr/sbin/brctl addbr $VAR(@) + if [ -n "$VAR(mac/@)" ] ; then + ip li set dev $VAR(@) address $VAR(mac/@) + fi ip link set $VAR(@) up delete: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ @@ -15,4 +18,3 @@ delete: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ fi ip link set $VAR(@) down; /usr/sbin/brctl delbr $VAR(@); - diff --git a/templates/interfaces/bridge/node.tag/mac/node.def b/templates/interfaces/bridge/node.tag/mac/node.def new file mode 100644 index 00000000..5b797830 --- /dev/null +++ b/templates/interfaces/bridge/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address +syntax:expression: exec "\ + /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)" |