pf-tools/pf-tools: FIX: iface_opt for options interface is depre...

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

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/2d610cff9b3a
changeset: 1199:2d610cff9b3a
user:      Richard Phan
date:      Tue Aug 20 10:37:02 2013 +0200
description:
FIX: iface_opt for options interface is deprecated

diffstat:

 lib/PFTools/Conf/Host.pm |   6 +++---
 lib/PFTools/Utils.pm     |  12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r b81cc9f37151 -r 2d610cff9b3a lib/PFTools/Conf/Host.pm
--- a/lib/PFTools/Conf/Host.pm	Mon Aug 19 17:03:27 2013 +0200
+++ b/lib/PFTools/Conf/Host.pm	Tue Aug 20 10:37:02 2013 +0200
@@ -738,10 +738,10 @@
 
     # Links option(s)
     if ( my $link_options
-         = $link_section_ref->{ 'iface_opt.' . $host_number }
-        || $link_section_ref->{'iface_opt'} )
+         = $link_section_ref->{ 'options.' . $host_number }
+        || $link_section_ref->{'options'} )
     {
-        $result->{'iface_opt'} = $link_options;
+        $result->{'options'} = $link_options;
     }
 
     # Check optional MAC address
diff -r b81cc9f37151 -r 2d610cff9b3a lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm	Mon Aug 19 17:03:27 2013 +0200
+++ b/lib/PFTools/Utils.pm	Tue Aug 20 10:37:02 2013 +0200
@@ -1486,22 +1486,22 @@
             push @iface_lines, qq{\tvlan_raw_device\t$raw_device};
 
             # Set MTU to 1496 unless told otherwise
-            if ($if_part->{'iface_opt'}
-                and $if_part->{'iface_opt'} !~ m{ mtu }xms
+            if ($if_part->{'options'}
+                and $if_part->{'options'} !~ m{ mtu }xms
                 )
             {
-                $if_part->{'iface_opt'} .= q{, mtu 1496};
+                $if_part->{'options'} .= q{, mtu 1496};
             }
             else {
-                $if_part->{'iface_opt'} = q{mtu 1496};
+                $if_part->{'options'} = q{mtu 1496};
             }
         }
 
         # Options
-        if ( $if_part->{'iface_opt'} ) {
+        if ( $if_part->{'options'} ) {
             foreach my $option (
                 split qr{ \s* [,] \s* }xms,
-                $if_part->{'iface_opt'}
+                $if_part->{'options'}
                 )
             {
                 push @iface_lines,