From 00e0ba004472e05cf5cdb9570aa2b32c6811e542 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 16 Sep 2005 16:58:30 +0000
Subject: revert previous simplification, it may break the unusual sagem over
 pppoe case

---
 perl-install/network/adsl.pm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'perl-install/network/adsl.pm')

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
-- 
cgit v1.2.1