summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-05-31 09:13:47 +0000
committerOlivier Blin <oblin@mandriva.org>2005-05-31 09:13:47 +0000
commit6a4680baa3e6165e7efc63cfc5b5e16725c1faee (patch)
treece9860e62841ae8f9287a65045c57c9b6317cc14
parent2abd00cb6810bc9da1314e55ff28ca3ddb2f412c (diff)
downloaddrakx-6a4680baa3e6165e7efc63cfc5b5e16725c1faee.tar
drakx-6a4680baa3e6165e7efc63cfc5b5e16725c1faee.tar.gz
drakx-6a4680baa3e6165e7efc63cfc5b5e16725c1faee.tar.bz2
drakx-6a4680baa3e6165e7efc63cfc5b5e16725c1faee.tar.xz
drakx-6a4680baa3e6165e7efc63cfc5b5e16725c1faee.zip
- rename "hw_account" step as "isdn_account"
- remove unneeded code - don't overwrite huptimeout value
-rw-r--r--perl-install/network/netconnect.pm17
1 files changed, 7 insertions, 10 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index c0b3b9984..ec6a6841f 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -338,10 +338,13 @@ sub real_main {
},
- hw_account =>
+ isdn_account =>
{
- name => N("Connection Configuration") . "\n\n" .
- N("Please fill or check the field below"),
+ pre => sub {
+ network::isdn::get_info_providers_backend($isdn, $netc, $provider);
+ $isdn->{huptimeout} ||= 180;
+ },
+ name => N("Connection Configuration") . "\n\n" . N("Please fill or check the field below"),
data => sub {
[
{ label => N("Your personal phone number"), val => \$isdn->{phone_in} },
@@ -530,13 +533,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.
[ { label => N("Provider:"), type => "list", val => \$provider, separator => '|',
list => [ N("Unlisted - edit manually"), network::isdn::read_providers_backend() ] } ];
},
- post => sub {
- network::isdn::get_info_providers_backend($isdn, $netc, $provider);
- $isdn->{huptimeout} = 180;
- $isdn->{$_} ||= '' foreach qw(phone_in phone_out dialing_mode login passwd passwd2 idl speed);
- add2hash($netc, { dnsServer2 => '', dnsServer3 => '', DOMAINNAME2 => '' });
- return "hw_account";
- },
+ next => "isdn_account",
},