pf-tools commit: r719 [parmelan-guest] - in /branches/0.33-stable: debian/changelog tools/kvmlaunch

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

Author: parmelan-guest
Date: Tue Nov 24 15:16:09 2009
New Revision: 719

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=719
Log:
* tools/kvmlaunch:
  - always keep eth0 first in the list of network interfaces on the kvm
    command line, otherwiser DHCP requests will go out on the wrong
    interface.

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/tools/kvmlaunch

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=719&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Tue Nov 24 15:16:09 2009
@@ -1,6 +1,6 @@
 pf-tools (0.33.19-0+WIP) unstable; urgency=low
 
-  [Christophe Caillet]
+  [ Christophe Caillet ]
   * lib/PFTools/Update.pm
     - in Do_updateloop : skipping circular dependancies for avoiding infinite
       loop
@@ -8,7 +8,13 @@
       specifies a version to install (NEED TESTING!!). A control is done for
       the availability of the specified version.
 
- -- Christophe Caillet <tof at sitadelle.com>  Wed, 16 Sep 2009 16:26:53 +0200
+  [ Thomas Parmelan ]
+  * tools/kvmlaunch:
+    - always keep eth0 first in the list of network interfaces on the kvm
+      command line, otherwiser DHCP requests will go out on the wrong
+      interface.
+
+ -- Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>  Tue, 24 Nov 2009 16:13:26 +0100
 
 pf-tools (0.33.18-1) unstable; urgency=low
 

Modified: branches/0.33-stable/tools/kvmlaunch
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/tools/kvmlaunch?rev=719&op=diff
==============================================================================
--- branches/0.33-stable/tools/kvmlaunch (original)
+++ branches/0.33-stable/tools/kvmlaunch Tue Nov 24 15:16:09 2009
@@ -391,7 +391,7 @@
 
     # sort the interfaces again, because of the game we played with bond interfaces
     return
-	sort { cmpif( $a->{'ifname'}, $b->{'ifname'} ) }
+	sort { __cmpif_kvm( $a->{'ifname'}, $b->{'ifname'} ) }
 	@interfaces;
 }
 
@@ -505,3 +505,12 @@
 	or carp "IGNORED: system(@cmd): $OS_ERROR\nGo check manually!";
 }
 
+# cmpif() with special-case to keep eth0 always first
+sub __cmpif_kvm {
+    my ($a, $b) = @_;
+
+    return 1 if $b eq 'eth0';
+
+    return cmpif($a, $b);
+}
+