summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-11-26 17:41:30 +0000
committerOlivier Blin <oblin@mandriva.com>2008-11-26 17:41:30 +0000
commit80878236e36c7743fb7abcc0e8328272f74054e7 (patch)
treed15bf28805d7dcea5a7560d19fd83be1c95132c8
parent1515876be90658f6d8ed03cb5148a9d25a654151 (diff)
downloaddrakx-net-80878236e36c7743fb7abcc0e8328272f74054e7.tar
drakx-net-80878236e36c7743fb7abcc0e8328272f74054e7.tar.gz
drakx-net-80878236e36c7743fb7abcc0e8328272f74054e7.tar.bz2
drakx-net-80878236e36c7743fb7abcc0e8328272f74054e7.tar.xz
drakx-net-80878236e36c7743fb7abcc0e8328272f74054e7.zip
use atm bridging interface if needed in pppoe command line
-rw-r--r--lib/network/connection/xdsl.pm11
1 files 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),