summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-09-16 16:58:30 +0000
committerOlivier Blin <oblin@mandriva.org>2005-09-16 16:58:30 +0000
commit00e0ba004472e05cf5cdb9570aa2b32c6811e542 (patch)
treeba3ea1464bfc5834c7e4f8ec6f56962a24770113
parent07fc0c8fd2124baddaab7997c58fcf7ac9801312 (diff)
downloaddrakx-backup-do-not-use-00e0ba004472e05cf5cdb9570aa2b32c6811e542.tar
drakx-backup-do-not-use-00e0ba004472e05cf5cdb9570aa2b32c6811e542.tar.gz
drakx-backup-do-not-use-00e0ba004472e05cf5cdb9570aa2b32c6811e542.tar.bz2
drakx-backup-do-not-use-00e0ba004472e05cf5cdb9570aa2b32c6811e542.tar.xz
drakx-backup-do-not-use-00e0ba004472e05cf5cdb9570aa2b32c6811e542.zip
revert previous simplification, it may break the unusual sagem over pppoe case
-rw-r--r--perl-install/network/adsl.pm21
-rw-r--r--perl-install/network/netconnect.pm1
2 files changed, 14 insertions, 8 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index f3b113682..72c16a641 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -208,12 +208,13 @@ mtu 1492),
avmadsl)
},
},
+ );
- pppoe_modem =>
+ my %generic =
+ (
+ pppoe =>
{
- server => {
- pppoe => '"pppoe -I ' . ($modems{$adsl_device}{get_intf} ? "`$modems{$adsl_device}{get_intf}`" : $net->{adsl}{ethernet_device}) . '"',
- },
+ server => '"pppoe -I ' . (exists $modems{$adsl_device}{get_intf} ? "`$modems{$adsl_device}{get_intf}`" : $net->{adsl}{ethernet_device}) . '"',
ppp_options => qq(default-asyncmap
mru 1492
mtu 1492
@@ -225,7 +226,7 @@ nodeflate
lcp-echo-interval 20
lcp-echo-failure 3
),
- }
+ }
);
if ($adsl_type =~ /^pp|^capi$/) {
@@ -239,10 +240,16 @@ lcp-echo-failure 3
);
$in->do_pkgs->install(@{$packages{$adsl_type}});
- my $pty_option = exists $modems{$adsl_device}{server}{$adsl_type} && "pty $modems{$adsl_device}{server}{$adsl_type}";
+ my $pty_option =
+ exists $modems{$adsl_device}{server}{$adsl_type} ? "pty $modems{$adsl_device}{server}{$adsl_type}" :
+ exists $generic{$adsl_type}{server} ? "pty $generic{$adsl_type}{server}" :
+ "";
my $plugin = exists $modems{$adsl_device}{plugin}{$adsl_type} && "plugin $modems{$adsl_device}{plugin}{$adsl_type}";
my $noipdefault = $adsl_type eq 'pptp' ? '' : 'noipdefault';
- my $ppp_options = exists $modems{$adsl_device}{ppp_options} && $modems{$adsl_device}{ppp_options};
+ my $ppp_options =
+ exists $modems{$adsl_device}{ppp_options} ? $modems{$adsl_device}{ppp_options} :
+ exists $generic{$adsl_type}{ppp_options} ? $generic{$adsl_type}{ppp_options} :
+ "";
output("$::prefix/etc/ppp/peers/ppp0",
qq(lock
persist
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index add23dbf3..a71ca1185 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -795,7 +795,6 @@ If you do not know it, keep the preselected type."),
$net->{adsl}{device} =
$net->{adsl}{method} eq 'capi' ? 'capi_modem' :
- $net->{adsl}{method} eq 'pppoe' ? 'pppoe_modem' :
$net->{adsl}{method} eq 'pptp' ? 'pptp_modem' :
$ntf_name;
# FIXME: duplicate with $after_start_on_boot_step sub