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

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

Author: ccaillet-guest
Date: Fri Apr 24 10:22:16 2009
New Revision: 708

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=708
Log:
* sbin/mk_pxelinuxcfg:
  - adding %DISTRIB% var handler in PXE templates
* lib/PFTools/Net.pm:
  - avoid ethtool setting in Mk_interface for tagged iface

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

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=708&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Fri Apr 24 10:22:16 2009
@@ -1,5 +1,6 @@
 pf-tools (0.33.18-0.WIP) unstable; urgency=low
 
+  [ Thomas Parmelan ]
   * WORK IN PROGRESS...
 
   * lib/PFTools/Update.pm:
@@ -20,7 +21,13 @@
       slave interfaces (to avoid having to compute non-conflicting MAC
       addresses for them).
 
- -- Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>  Tue, 07 Apr 2009 16:59:03 +0200
+  [ Christophe Caillet ]
+  * sbin/mk_pxelinuxcfg:
+    - adding %DISTRIB% var handler in PXE templates
+  * lib/PFTools/Net.pm:
+    - avoid ethtool setting in Mk_interface for tagged iface
+
+ -- Christophe Caillet <tof at sitadelle.com>  Fri, 24 Apr 2009 12:18:13 +0200
 
 pf-tools (0.33.17-1) unstable; urgency=low
 

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=708&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Net.pm (original)
+++ branches/0.33-stable/lib/PFTools/Net.pm Fri Apr 24 10:22:16 2009
@@ -1888,11 +1888,13 @@
 
 	if ( !$mediaerror ) {
 	    my $ifname = $M->{'ifup'}->{$nam};
+	    my $iftag;
 	    if ( $ifname =~ m/^([^:.]+)\.(\d+)(:\d+)?$/ ) {
 		$ifname = $1;
+		$iftag = $2;
 	    }
 #	    unless ( $ifname =~ /^bond/ ) {
-	    unless ( $M->{'bonding'}->{$ifname} ) {
+	    unless ( $M->{'bonding'}->{$ifname} || $iftag ) {
 		print "\tup              ethtool -s " 
 		    . $ifname . " "
 		    . $defaultmedia

Modified: branches/0.33-stable/sbin/mk_pxelinuxcfg
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/sbin/mk_pxelinuxcfg?rev=708&op=diff
==============================================================================
--- branches/0.33-stable/sbin/mk_pxelinuxcfg (original)
+++ branches/0.33-stable/sbin/mk_pxelinuxcfg Fri Apr 24 10:22:16 2009
@@ -190,6 +190,7 @@
 								if ( $debian_installer ) {
 									# Building preseed file
 									$temptemplatecontent =~ s/%DEPLOYMODE%/$M->{'deploymode'}/gs ;
+									$temptemplatecontent =~ s/%DISTRIB%/$M->{'distrib'}/gs ;
 									my $preseed_file = Build_preseed_filename ( $m, $M ) ;
 									# MD5sum on generated preseed file
 									$temptemplatecontent =~