Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-op into oxnard

3 files changed, 43 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 3022668..5350e0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+vyatta-op (0.13.234) unstable; urgency=low
+
+  * Bug 4086:fixed order of display in show dns forwarding nameservers,
+    removed redundant information
+
+ -- Gaurav <gaurav.sinha@vyatta.com>  Tue, 21 Feb 2012 16:31:54 -0800
+
+vyatta-op (0.13.233) unstable; urgency=low
+
+  * Add bridge info to show tech support
+
+ -- Stephen Hemminger <shemminger@vyatta.com>  Tue, 21 Feb 2012 12:14:33 -0800
+
 vyatta-op (0.13.232) unstable; urgency=low
 
   [ Stephen Hemminger ]
diff --git a/functions/tech-support b/functions/tech-support
index cf1fc2f..570ef2d 100755
--- a/functions/tech-support
+++ b/functions/tech-support
@@ -100,24 +100,31 @@ header Ethernet
 header Interface statistics
 ip -s link show
 
-for eth in $(cd /sys/class/net; echo eth*)
+for eth in $(/opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet)
 do header "Physical Interface statistics for $eth"
    sudo ethtool -S $eth
 done
 
-for eth in $(cd /sys/class/net; echo eth*)
+for eth in $(/opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet)
 do header "Physical Interface Details for $eth"
    show interfaces ethernet $eth physical 
+   /sbin/ethtool -k $eth
 done
 
-header Physical Interface Offload Settings and Capabilities
-sudo ethtool -K
- 
 header "ARP Table (Total entries)"
 show arp
 
 header Number of incomplete entries in ARP table
 show arp | grep incomplete | wc -l  
+
+header Bridge
+/usr/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
+done
+
 header Serial
 
 header "WAN Interface Hardware Information (wanrouter hwprobe)" 
diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl
index dc5fbf1..5f94c15 100755
--- a/scripts/vyatta-op-dns-forwarding.pl
+++ b/scripts/vyatta-op-dns-forwarding.pl
@@ -188,6 +188,9 @@ sub get_dns_nameservers {
         $show_nameservers_output .= "-----------------------------------------------\n";
         $show_nameservers_output .= "   Nameservers configured for DNS forwarding\n";
         $show_nameservers_output .= "-----------------------------------------------\n";
+        my $show_nameservers_output_dhcp;
+        my $show_nameservers_output_domain;
+        my $show_nameservers_output_nameserver;
 
         my $line_flag;
         ## server=/test.com/1.1.1.1 
@@ -204,9 +207,9 @@ sub get_dns_nameservers {
                     @domain_tokens = split(/\//, $nameserver);
                     if (!defined($line_flag)) { 
                         $line_flag = 1;
-                        $show_nameservers_output .= "\n";
-                        $show_nameservers_output .= "Domain Overrides\n";
-                        $show_nameservers_output .= "\n";
+                        $show_nameservers_output_domain .= "\n";
+                        $show_nameservers_output_domain .= "Domain Overrides:\n";
+                        $show_nameservers_output_domain .= "\n";
                     }      
                 } 
 		$active_nameservers[$active_nameserver_count] = $nameserver;
@@ -214,13 +217,22 @@ sub get_dns_nameservers {
                 my $nameserver_via = $nameserver_array[2];
                 if (@nameserver_array > 3){
 		   my $dhcp_interface = $nameserver_array[3];
-	           $show_nameservers_output .= "$nameserver available via '$nameserver_via $dhcp_interface'\n";
+	           $show_nameservers_output_dhcp .= "$nameserver available via '$nameserver_via $dhcp_interface'\n";
                  } elsif (@domain_tokens) {
-                     $show_nameservers_output .= "$domain_tokens[1] uses $domain_tokens[2] via '$nameserver_via'\n";
+                     $show_nameservers_output_domain .= "$domain_tokens[1] uses $domain_tokens[2]\n";
                    } else {
- 		   $show_nameservers_output .= "$nameserver available via '$nameserver_via'\n";
+ 		   $show_nameservers_output_nameserver .= "$nameserver available via '$nameserver_via'\n";
  		}
         }
+        if (defined ($show_nameservers_output_nameserver)) {
+          $show_nameservers_output .= $show_nameservers_output_nameserver;
+        }
+        if (defined ($show_nameservers_output_dhcp)) {
+          $show_nameservers_output .= $show_nameservers_output_dhcp;
+        }
+        if (defined ($show_nameservers_output_domain)) {
+          $show_nameservers_output .= $show_nameservers_output_domain ;
+        }
 
 	# then you need to get nameservers from /etc/resolv.conf that are not in dnsmasq.conf to show them as inactive