summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-19 16:31:43 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-19 16:31:43 +0000
commitc3b1997c49e96ce1e11a1b030ef92e7494db2373 (patch)
treeae7e39bc16c6dd2216ebb9ad75ea8a98785418ff
parenta36dc6d8fd244e0ab7b2093d43e88b47cc63219d (diff)
downloaddrakx-c3b1997c49e96ce1e11a1b030ef92e7494db2373.tar
drakx-c3b1997c49e96ce1e11a1b030ef92e7494db2373.tar.gz
drakx-c3b1997c49e96ce1e11a1b030ef92e7494db2373.tar.bz2
drakx-c3b1997c49e96ce1e11a1b030ef92e7494db2373.tar.xz
drakx-c3b1997c49e96ce1e11a1b030ef92e7494db2373.zip
make a real wizard step out of first modem step
-rw-r--r--perl-install/network/netconnect.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index a73d3a629..b9d51d6cc 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -440,6 +440,7 @@ Take a look at http://www.linmodems.org")
modem =>
{
pre => sub {
+ detect($netc->{autodetect}, 'modem') if !$::isInstall;
$netcnx->{type} = 'modem';
my $modem = $netcnx->{$netcnx->{type}};
$modem->{device} = $netc->{autodetect}{modem};
@@ -458,9 +459,12 @@ Take a look at http://www.linmodems.org")
foreach (@$secret) {
$modem->{passwd} = $_->{passwd} if $_->{login} eq $modem->{login};
}
-
- return $ppp_first_step->();
},
+ name => N("Select the modem to configure:"),
+ data => sub {
+ [ { label => N("Modem"), type => "list", val => \$ntf_name, list => [ grep { $_ } $netc->{autodetect}{modem}, values %{$netc->{autodetect}{winmodem}} ], allow_empty_list => 1 } ],
+ },
+ post => $ppp_first_step,
},
# FIXME: only if $need_to_ask