diff options
| author | Daniil Baturin <daniil@baturin.org> | 2016-12-12 05:24:34 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 05:24:34 +0700 |
| commit | 71989c2918185c52e4346126dc2b6d7249819458 (patch) | |
| tree | 3ec0aec3ea343b2900eb139137dbf0e88af111f5 | |
| parent | 24fce18b11bc636854ad0c928d162a5a0233afe5 (diff) | |
| parent | 241b09ddba6666c48113ff61f927c12a4860ec8b (diff) | |
| download | vyatta-op-71989c2918185c52e4346126dc2b6d7249819458.tar.gz vyatta-op-71989c2918185c52e4346126dc2b6d7249819458.zip | |
Merge pull request #7 from EwaldvanGeffen/current
T207: modified brctl location
| -rwxr-xr-x | functions/tech-support | 6 | ||||
| -rw-r--r-- | templates/show/bridge/node.def | 2 | ||||
| -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 |
5 files changed, 7 insertions, 7 deletions
diff --git a/functions/tech-support b/functions/tech-support index 680dc09..e4602d2 100755 --- a/functions/tech-support +++ b/functions/tech-support @@ -122,11 +122,11 @@ header Number of incomplete entries in ARP table show arp | grep incomplete | wc -l header Bridge -/usr/sbin/brctl show +/sbin/brctl show for br in $(/opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge) do header "Bridge Information for $br" - /usr/sbin/brctl showstp $br - /usr/sbin/brctl showmacs $br + /sbin/brctl showstp $br + /sbin/brctl showmacs $br done header Serial diff --git a/templates/show/bridge/node.def b/templates/show/bridge/node.def index a1ed782..86d0193 100644 --- a/templates/show/bridge/node.def +++ b/templates/show/bridge/node.def @@ -1,2 +1,2 @@ help: Show bridging information -run: /usr/sbin/brctl show +run: /sbin/brctl show diff --git a/templates/show/bridge/node.tag/macs/node.def b/templates/show/bridge/node.tag/macs/node.def index d07958c..e985437 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: /usr/sbin/brctl showmacs "$3" +run: /sbin/brctl showmacs "$3" diff --git a/templates/show/bridge/node.tag/node.def b/templates/show/bridge/node.tag/node.def index d20611f..0ae82f1 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 '<brN>' ${array[@]##*/} -run: /usr/sbin/brctl show "$3" +run: /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 3921867..360d15a 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: /usr/sbin/brctl showstp "$3" +run: /sbin/brctl showstp "$3" |