diff options
author | damien <damien@mandriva.com> | 2000-08-29 17:06:05 +0000 |
---|---|---|
committer | damien <damien@mandriva.com> | 2000-08-29 17:06:05 +0000 |
commit | 3161708c83a46d247c81b7681fd6a64f3c4a1310 (patch) | |
tree | 7240b96b265f51d3c93ca60fbe4d94214d13d162 /perl-install/install_steps_interactive.pm | |
parent | f2ef37015a716cf8feeb66f6e7505915ce30a27a (diff) | |
download | drakx-3161708c83a46d247c81b7681fd6a64f3c4a1310.tar drakx-3161708c83a46d247c81b7681fd6a64f3c4a1310.tar.gz drakx-3161708c83a46d247c81b7681fd6a64f3c4a1310.tar.bz2 drakx-3161708c83a46d247c81b7681fd6a64f3c4a1310.tar.xz drakx-3161708c83a46d247c81b7681fd6a64f3c4a1310.zip |
see changelog.
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r-- | perl-install/install_steps_interactive.pm | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index a5c22274e..2a0593834 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -564,40 +564,7 @@ You may also enter the IP address of the gateway if you have one"), } #------------------------------------------------------------------------------ -sub pppConfig { - my ($o) = @_; - my $m = $o->{modem} ||= {}; - - unless ($m->{device} || $::expert && !$o->ask_yesorno('', _("Try to find a modem?"), 1)) { - eval { modules::load("serial"); }; - detect_devices::probeSerialDevices(); - foreach (0..3) { - next if $o->{mouse}{device} =~ /ttyS$_/; - detect_devices::hasModem("/dev/ttyS$_") and $m->{device} = "ttyS$_", last; - } - } - - $m->{device} ||= $o->set_help('selectSerialPort') && - $o->ask_from_listf('', _("Please choose which serial port your modem is connected to."), - \&mouse::serial_port2text, - [ grep { $_ ne $o->{mouse}{device} } mouse::serial_ports ]); - - $o->set_help('configureNetworkISP'); - install_steps::pppConfig($o) if $o->ask_from_entries_refH('', - _("Dialup options"), [ -_("Connection name") => \$m->{connection}, -_("Phone number") => \$m->{phone}, -_("Login ID") => \$m->{login}, -_("Password") => { val => \$m->{passwd}, hidden => 1 }, -_("Authentication") => { val => \$m->{auth}, list => [ __("PAP"), __("CHAP"), __("Terminal-based"), __("Script-based") ] }, -_("Domain name") => \$m->{domain}, -#-$::expert ? ( #- It is not apropriate to remove DNS as kppp need them! only available for "ifup ppp0" -_("First DNS Server") => \$m->{dns1}, -_("Second DNS Server") => \$m->{dns2}, -#-) : (), - ]); -} - +#-pppConfig moved to any.pm #------------------------------------------------------------------------------ sub installCrypto { my ($o) = @_; |