From 80878236e36c7743fb7abcc0e8328272f74054e7 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 26 Nov 2008 17:41:30 +0000
Subject: use atm bridging interface if needed in pppoe command line

---
 lib/network/connection/xdsl.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/network/connection/xdsl.pm b/lib/network/connection/xdsl.pm
index 56cd294..7d97f56 100644
--- a/lib/network/connection/xdsl.pm
+++ b/lib/network/connection/xdsl.pm
@@ -42,6 +42,13 @@ sub uses_atm_bridging {
 }
 sub get_atm_bridging_interface { "nas0" }
 
+sub get_pppoe_interface {
+    my ($self) = @_;
+    $self->uses_atm_bridging
+    ? $self->get_atm_bridging_interface
+    : $self->network::connection::ethernet::get_interface;
+}
+
 my %protocol_settings = (
     pppoa => {
         plugin => sub {
@@ -52,8 +59,8 @@ my %protocol_settings = (
     pppoe => {
         pty => sub {
             my ($self) = @_;
-            my $eth_interface = $self->network::connection::ethernet::get_interface;
-            qq("pppoe -m 1412 -I $eth_interface");
+            my $pppoe_interface = $self->get_pppoe_interface;
+            qq("pppoe -m 1412 -I $pppoe_interface");
         },
         options => [
             qw(default-asyncmap noaccomp nobsdcomp novjccomp nodeflate),
-- 
cgit v1.2.1