pf-tools commit: r668 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog lib/PFTools/Net.pm

[parmelan-guest at users.alioth.debian.org]

Author: ccaillet-guest
Date: Tue Nov  4 11:27:12 2008
New Revision: 668

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=668
Log:
* Bugfix release
* Remove useless call for ethtool on bond interfaces (backport r667 from trunk)

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/lib/PFTools/Net.pm

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=668&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Tue Nov  4 11:27:12 2008
@@ -1,3 +1,10 @@
+pf-tools (0.33.12-1) unstable; urgency=low
+
+  * Bugfix release
+  * Remove useless call for ethtool on bond interfaces (backport r667 from trunk)
+
+ -- Christophe Caillet <tof at sitadelle.com>  Tue, 04 Nov 2008 12:25:58 +0100
+
 pf-tools (0.33.11-1) unstable; urgency=low
 
   * Fixing filter filter_distrib

Modified: branches/0.33-stable/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/lib/PFTools/Net.pm?rev=668&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Net.pm (original)
+++ branches/0.33-stable/lib/PFTools/Net.pm Tue Nov  4 11:27:12 2008
@@ -1880,10 +1880,12 @@
 	    if ( $ifname =~ m/^([^:.]+)\.(\d+)(:\d+)?$/ ) {
 		$ifname = $1;
 	    }
-	    print "\tup              ethtool -s " 
-		. $ifname . " "
-		. $defaultmedia
-		. " || true\n";
+	    unless ( $ifname =~ /^bond/ ) {
+		print "\tup              ethtool -s " 
+		    . $ifname . " "
+		    . $defaultmedia
+		    . " || true\n";
+	    }
 	}
 
 	Mk_routes( $M, $Z, $M->{'ifup'}->{$nam} );