diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-05-30 07:51:46 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-05-30 07:51:46 +0000 |
| commit | ec037974aa4b229446e26c24f7a251994d701943 (patch) | |
| tree | 920fbc302058101706e20cd5b692b1cb92c4cf97 | |
| parent | 8e0be3d8c1d3f6df3c75b98d6fdbde773ddfb2e1 (diff) | |
| download | drakx-ec037974aa4b229446e26c24f7a251994d701943.tar drakx-ec037974aa4b229446e26c24f7a251994d701943.tar.gz drakx-ec037974aa4b229446e26c24f7a251994d701943.tar.bz2 drakx-ec037974aa4b229446e26c24f7a251994d701943.tar.xz drakx-ec037974aa4b229446e26c24f7a251994d701943.zip | |
simply isdn external modem code (remove $netcnx->{isdn_external})
| -rw-r--r-- | perl-install/network/netconnect.pm | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index b1b21aabc..24e195b96 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -429,16 +429,7 @@ sub real_main { if ($isdn_name eq $my_isdn) { return "isdn_ask"; } elsif ($isdn_name eq N("External ISDN modem")) { - detect($modules_conf, $netc->{autodetect}, 'modem'); $netcnx->{type} = $netc->{isdntype} = 'isdn_external'; - $netcnx->{isdn_external}{device} = network::modem::first_modem($netc); - network::isdn::read_config($netcnx->{isdn_external}); - #- FIXME: seems to be specific to ZyXEL Adapter Omni.net/TA 128/Elite 2846i - #- it does not even work with TA 128 modems - #- http://bugs.mandrakelinux.com/query.php?bug=1033 - $netcnx->{isdn_external}{special_command} = 'AT&F&O2B40'; - require network::modem; - $modem = $netcnx->{isdn_external}; return "modem"; } @@ -568,9 +559,15 @@ Take a look at http://www.linmodems.org"), modem => { pre => sub { - require network::modem; - detect($modules_conf, $netc->{autodetect}, 'modem'); - $modem ||= $netcnx->{modem} ||= {}; + require network::modem; + detect($modules_conf, $netc->{autodetect}, 'modem'); + $modem = {}; + if ($netcnx->{type} eq 'isdn_external') { + #- FIXME: seems to be specific to ZyXEL Adapter Omni.net/TA 128/Elite 2846i + #- it does not even work with TA 128 modems + #- http://bugs.mandrakelinux.com/query.php?bug=1033 + $modem->{special_command} = 'AT&F&O2B40'; + } }, name => N("Select the modem to configure:"), data => sub { |