summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-23 08:26:39 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-23 08:26:39 +0000
commitde4ab3b1eb593fe3e004e77abd686df1eab4cf27 (patch)
tree3d76bf01dca4af11c8a98382a2f1b8d5fc355620
parentcbb55361e3aab6a0d3d074fd3f1467c5580857c3 (diff)
downloaddrakx-de4ab3b1eb593fe3e004e77abd686df1eab4cf27.tar
drakx-de4ab3b1eb593fe3e004e77abd686df1eab4cf27.tar.gz
drakx-de4ab3b1eb593fe3e004e77abd686df1eab4cf27.tar.bz2
drakx-de4ab3b1eb593fe3e004e77abd686df1eab4cf27.tar.xz
drakx-de4ab3b1eb593fe3e004e77abd686df1eab4cf27.zip
enable one to manually choose the serial port to use while configuring modem
-rw-r--r--perl-install/network/netconnect.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index d7fb1966e..f51616391 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -362,10 +362,12 @@ Take a look at http://www.linmodems.org"),
},
name => N("Select the modem to configure:"),
data => sub {
- [ { label => N("Modem"), type => "list", val => \$modem_name, list => [ keys %{$netc->{autodetect}{modem}} ], allow_empty_list => 1 } ],
+ [ { label => N("Modem"), type => "list", val => \$modem_name, allow_empty_list => 1,
+ list => [ keys %{$netc->{autodetect}{modem}}, N("Manual choice") ], } ],
},
post => sub {
$modem ||= $netcnx->{modem} ||= {};;
+ return 'choose_serial_port' if $modem_name eq N("Manual choice");
$ntf_name = $netc->{autodetect}{modem}{$modem_name}{device} || $netc->{autodetect}{modem}{$modem_name}{description};
return "ppp_provider" if $ntf_name =~ m!^/dev/!;
@@ -401,7 +403,10 @@ Take a look at http://www.linmodems.org"),
[ { varl=> \$modem->{device}, format => \&mouse::serial_port2text, type => "list",
list => [ grep { $_ ne $o_mouse->{device} } (if_(-e '/dev/modem', '/dev/modem'), mouse::serial_ports()) ] } ],
},
- next => "ppp_provider",
+ post => sub {
+ $ntf_name = $modem->{device};
+ return 'ppp_provider';
+ },
},