diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-04-14 18:20:07 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-04-14 18:20:07 -0700 |
| commit | 82a63555b86bbc2e3418385cde82187af3880b20 (patch) | |
| tree | 4974a3b3f0e824c9fc20e303866111ad5c9cfb21 | |
| parent | 79954f9cd170ff656cd64f764b824db8fa145bfe (diff) | |
| parent | b263eb4bb4175b7c195351b343f3d2b1636bedf9 (diff) | |
| download | vyatta-op-82a63555b86bbc2e3418385cde82187af3880b20.tar.gz vyatta-op-82a63555b86bbc2e3418385cde82187af3880b20.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
templates/show/bridge/node.tag/macs/node.def
| -rw-r--r-- | templates/show/bridge/node.tag/macs/node.def | 2 | ||||
| -rw-r--r-- | templates/show/bridge/node.tag/node.def | 2 | ||||
| -rw-r--r-- | templates/show/bridge/node.tag/spanning-tree/node.def | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/templates/show/bridge/node.tag/macs/node.def b/templates/show/bridge/node.tag/macs/node.def index 86cf661..d07958c 100644 --- a/templates/show/bridge/node.tag/macs/node.def +++ b/templates/show/bridge/node.tag/macs/node.def @@ -1,2 +1,2 @@ help: Show bridge Media Access Control (MAC) address table -run: brctl showmacs "$3" +run: /usr/sbin/brctl showmacs "$3" diff --git a/templates/show/bridge/node.tag/node.def b/templates/show/bridge/node.tag/node.def index fae7bab..db7fcca 100644 --- a/templates/show/bridge/node.tag/node.def +++ b/templates/show/bridge/node.tag/node.def @@ -2,4 +2,4 @@ help: Show bridge information for a given bridge interface allowed: local -a array ; array=( /sys/class/net/br* ) ; echo -n ${array[@]##*/} -run: brctl show "$3" +run: /usr/sbin/brctl show "$3" diff --git a/templates/show/bridge/node.tag/spanning-tree/node.def b/templates/show/bridge/node.tag/spanning-tree/node.def index b3e06e8..3921867 100644 --- a/templates/show/bridge/node.tag/spanning-tree/node.def +++ b/templates/show/bridge/node.tag/spanning-tree/node.def @@ -1,2 +1,2 @@ help: Show bridge spanning tree information -run: brctl showstp "$3" +run: /usr/sbin/brctl showstp "$3" |