forward speedtouch fix (using kernel mode)

2 files changed, 15 insertions, 20 deletions

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 9dab12255..d5705d5da 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -134,17 +134,17 @@ sync
 
                   speedtouch =>
                   {
-                   start => '/usr/sbin/modem_run -v 0 -f /usr/share/speedtouch/mgmt.o',
+                   start => '/usr/sbin/modem_run -k -n 2 -f /usr/share/speedtouch/mgmt.o',
                    overide_script => 1,
                    server => {
-                              pppoa => '"/usr/sbin/pppoa3 -e 1 -c -vpi ' . hex($netc->{vpi}) . " -vci " . hex($netc->{vci}) . '"',
+                              pppoa => '"/usr/sbin/pppoa3 -e 1 -c"
+plugin pppoatm.so
+' . join('.', hex($netc->{vpi}), hex($netc->{vci})),
                              },
                    ppp_options => qq(
 sync
 noaccomp),
                    aliases => [
-                               # disable kernel driver, we use userland stuff but for firmware upload
-                               if_(c::kernel_version() =~ /^\Q2.4/, ['speedtch', 'off']),
                                ['char-major-108', 'ppp_generic'],
                                ['tty-ldisc-3', 'ppp_async'],
                                ['tty-ldisc-13', 'n_hdlc'],
@@ -238,7 +238,6 @@ defaultroute)
 	output("$::prefix/etc/ppp/peers/adsl",
 qq(noauth
 noipdefault
-pty $modems{$adsl_device}{server}{$adsl_type}
 $modems{$adsl_device}{ppp_options}
 kdebug 1
 nopcomp
@@ -249,6 +248,7 @@ maxfail 25
 persist
 usepeerdns
 defaultroute
+pty $modems{$adsl_device}{server}{$adsl_type}
 user "$adsl->{login}"
 ));
 
@@ -284,8 +284,6 @@ user "$adsl->{login}"
         set_cnx_script($netc, "adsl", join("\n",
                                              "/sbin/route del default",
                                              $modems{$adsl_device}{start},
-                                             # /usr/sbin/pppd call adsl
-                                             #$modems{$adsl_device}{server}{$adsl_type} ||
 					     "/usr/sbin/pppd file /etc/ppp/peers/adsl $modems{$adsl_device}{pppd_options}",
                                              $ppp_options{$adsl_type}{connect}
                                             ),
@@ -336,9 +334,16 @@ INTERFACE=`$modems{$adsl_device}{get_intf}`
     } elsif ($adsl_device eq 'speedtouch') {
         # speedtouch really is used only with pppoa, let its own script handle firmware upload and the like:
         set_cnx_script($netc, 'adsl', 
-                         qq(/sbin/route del default
-/usr/share/speedtouch/speedtouch.sh start\n),
-                         "/usr/share/speedtouch/speedtouch.sh stop\n",
+                         qq(/sbin/route del default 2>/dev/null
+/usr/sbin/modem_run -k -n 2 -f /usr/share/speedtouch/mgmt.o
+pppd call adsl
+
+for i in 0 1 2 3 4; do
+    /sbin/ifconfig | grep -q 'ppp' && exit
+    sleep 3
+done
+exit 1\n),
+                         "/usr/bin/killall pppd\n",
                          $netc->{adsltype});
     }
 
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 18f75b032..0ad6c1f41 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -334,10 +334,6 @@ sub real_main {
                         [ { label => N("Net Device"), type => "list", val => \$isdn_name, allow_empty_list => 1, 
                             list => [ $my_isdn, N("External ISDN modem"), keys %isdn_cards ] } ]
                     },
-                    complete => sub {
-                        $in->ask_warn(N("Warning"), N("Sorry, we support only 2.4 and above kernels.")) if c::kernel_version() !~ /^\Q2.4/;
-                        return 0;
-                    },
                     post => sub {
                         # !intern_pci:
                         # data => [ { val => \$isdn_type, type => "list", list => [ ,  ], } ],
@@ -653,12 +649,6 @@ killall pppd
                     name => N("ADSL configuration") . "\n\n" . N("Select the network interface to configure:"),
                     data =>  [ { label => N("Net Device"), type => "list", val => \$ntf_name, allow_empty_list => 1,
                                list => \@adsl_devices, format => sub { $eth_intf{$_[0]} || $adsl_devices{$_[0]} } } ],
-                    complete => sub {
-			if (c::kernel_version() !~ /^\Q2.4/ && $ntf_name eq 'speedtouch') {
-			    $in->ask_warn(N("Warning"), N("Sorry, we support only 2.4 and above kernels."));
-			}
-                        return 0;
-                    },
                     post => sub {
                         my %packages = (
                                         'eci'        => [ 'eciadsl', 'missing' ],