pf-tools commit: r709 [ccaillet-guest] - in /trunk: debian/changelog lib/PFTools/Net.pm

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

Author: ccaillet-guest
Date: Fri Apr 24 10:29:47 2009
New Revision: 709

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=709
Log:
Avoid ethtool settings in Mk_interfaces for tagged interface(s)

Modified:
    trunk/debian/changelog
    trunk/lib/PFTools/Net.pm

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=709&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Fri Apr 24 10:29:47 2009
@@ -30,6 +30,7 @@
   * Introducing an abstraction layer for packages : Packages.pm. Need to
     integrate those functions into Update.pm
   * Integration of PFTools::Packages into Update.pm (need testing)
+  * Avoid ethtool settings in Mk_interfaces for tagged interface(s)
 
   [ Thomas Parmelan ]
   * debian/control
@@ -51,7 +52,7 @@
   * tools/kvmlaunch:
     - new script.
 
- -- Christophe Caillet <tof at sitadelle.com>  Wed, 18 Mar 2009 16:12:13 +0100
+ -- Christophe Caillet <tof at sitadelle.com>  Fri, 24 Apr 2009 12:28:35 +0200
 
 pf-tools (0.33.1-1) unstable; urgency=low
 

Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=709&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Fri Apr 24 10:29:47 2009
@@ -1772,10 +1772,12 @@
 
 	if ( !$mediaerror ) {
 	    my $ifname = $M->{'ifup'}->{$nam};
+	    my $iftag;
 	    if ( $ifname =~ m/^([^:.]+)\.(\d+)(:\d+)?$/ ) {
 		$ifname = $1;
-	    }
-	    unless ( $M->{'bonding'}->{$ifname} ) {
+		$iftag = $2;
+	    }
+	    unless ( $M->{'bonding'}->{$ifname} || $iftag ) {
 		print "\tup              ethtool -s " 
 		. $ifname . " "
 		. $defaultmedia