pf-tools/pf-tools: FIX: bonding mode is now include in options i...

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

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/412da1bae65d
changeset: 1188:412da1bae65d
user:      Richard Phan
date:      Tue Jul 16 10:29:45 2013 +0200
description:
FIX: bonding mode is now include in options interfaces

diffstat:

 lib/PFTools/Structqueries.pm |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 17ee78220ff8 -r 412da1bae65d lib/PFTools/Structqueries.pm
--- a/lib/PFTools/Structqueries.pm	Mon Jul 15 15:13:53 2013 +0200
+++ b/lib/PFTools/Structqueries.pm	Tue Jul 16 10:29:45 2013 +0200
@@ -1,6 +1,7 @@
 package PFTools::Structqueries;
 
 #
+#  Copyright (C) 2013 Richard Phan <richard.phan.prestataire at sfr.com>
 #  Copyright (C) 2007-2010 Christophe Caillet <quadchris at free.fr>
 #  Copyright (C) 2005-2007 Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>
 #  Copyright (C) 2003-2005 Damien Clermonte <damien at sitadelle.com>
@@ -74,19 +75,26 @@
 
     my $cmdline = $host_ref->{'boot'}->{'cmdline'} || q{};
     my $bond_cmdline = q{};
+    my $bond_mode = q{};
+
     foreach my $iface ( sort keys %{ $host_ref->{'interfaces'} } ) {
         next if $iface !~ m{\A bond }xms;
 
-        $bond_cmdline
-            = qq/bonding.mode=$host_ref->{'interfaces'}->{$iface}->{'mode'}/;
         foreach my $opt (
             split qr{ \s* [,] \s* }xms,
             $host_ref->{'interfaces'}->{$iface}->{'options'}
             )
         {
-            $bond_cmdline .= qq{ bonding.$opt};
+            if ( $opt !~ m{\A mode }xms ) {
+                $bond_cmdline .= qq{ bonding.$opt};
+            }
+            else {
+                $bond_mode = qq{bonding.$opt};
+            }
         }
 
+        $bond_cmdline = $bond_mode . $bond_cmdline;
+
         last;
     }