Merge branch 'islavista' into jenner

1 files changed, 7 insertions, 7 deletions

diff --git a/scripts/vyatta-show-bonding.pl b/scripts/vyatta-show-bonding.pl
index c3f5b01..8a0daee 100755
--- a/scripts/vyatta-show-bonding.pl
+++ b/scripts/vyatta-show-bonding.pl
@@ -71,7 +71,7 @@ sub show_brief {
     my $format     = "%-12s %-10s %-8s %-6s %s\n";
 
     printf $format, 'Interface', 'Mode', 'State', 'Link', 'Slaves';
-    foreach my $intf (@interfaces) {
+    foreach my $intf (sort @interfaces) {
         my $mode = get_sysfs_value( $intf, "bonding/mode" );
         $mode =~ s/ [0-9]+$//;
         my ( $state, $link ) = get_state_link($intf);
@@ -86,19 +86,19 @@ sub show {
     my $format     = "%-16s %-10s %-10s  %-10s %-10s\n";
 
     printf $format, "Interface", "RX: bytes", "packets", "TX: bytes", "packets";
-    foreach my $intf (@interfaces) {
+    foreach my $intf (sort @interfaces) {
         my @slaves = split( / /, get_sysfs_value( $intf, "bonding/slaves" ) );
         printf $format, $intf, get_sysfs_value( $intf, "statistics/rx_bytes" ),
           get_sysfs_value( $intf, "statistics/rx_packets" ),
           get_sysfs_value( $intf, "statistics/tx_bytes" ),
           get_sysfs_value( $intf, "statistics/tx_packets" );
 
-        foreach my $slave (@slaves) {
+        foreach my $slave (sort @slaves) {
             printf $format, '    ' . $slave,
-              get_sysfs_value( $intf, "statistics/rx_bytes" ),
-              get_sysfs_value( $intf, "statistics/rx_packets" ),
-              get_sysfs_value( $intf, "statistics/tx_bytes" ),
-              get_sysfs_value( $intf, "statistics/tx_packets" );
+              get_sysfs_value( $slave, "statistics/rx_bytes" ),
+              get_sysfs_value( $slave, "statistics/rx_packets" ),
+              get_sysfs_value( $slave, "statistics/tx_bytes" ),
+              get_sysfs_value( $slave, "statistics/tx_packets" );
         }
     }
 }