summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-09 21:05:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-09 21:05:34 +0000
commitf0f366d517c87f347f889394416ea21289eec83f (patch)
tree6960d14189bc35bf920f037fe2d43433f945fdf3 /perl-install/install_steps_interactive.pm
parentda93dce60a01e338efbea41e3e2134d9c1e03fe2 (diff)
downloaddrakx-f0f366d517c87f347f889394416ea21289eec83f.tar
drakx-f0f366d517c87f347f889394416ea21289eec83f.tar.gz
drakx-f0f366d517c87f347f889394416ea21289eec83f.tar.bz2
drakx-f0f366d517c87f347f889394416ea21289eec83f.tar.xz
drakx-f0f366d517c87f347f889394416ea21289eec83f.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm24
1 files changed, 10 insertions, 14 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ddafab251..2cb1e567f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -348,26 +348,22 @@ sub afterInstallPackages($) {
sub configureNetwork($) {
my ($o, $first_time) = @_;
local $_;
- if ($o->{intf}) {
- if (!$::beginner && $first_time || $::expert) {
- my @l = (
- __("Keep the current IP configuration"),
- __("Reconfigure network now"),
- __("Do not set up networking"),
- );
- $_ = $o->ask_from_list_([ _("Network Configuration") ],
- _("Local networking has already been configured. Do you want to:"),
- [ @l ]) || "Do not";
- } else { $_ = "Keep"; }
- } elsif ($o->{modem}) {
- $_ = "Dialup";
+ if ($o->{intf} && $first_time) {
+ my @l = (
+ __("Keep the current IP configuration"),
+ __("Reconfigure network now"),
+ __("Do not set up networking"),
+ );
+ $_ = $::beginner ? "Keep" :
+ $o->ask_from_list_([ _("Network Configuration") ],
+ _("Local networking has already been configured. Do you want to:"),
+ [ @l ]) || "Do not";
} else {
$_ = $::beginner ? "Do not" :
$o->ask_from_list_([ _("Network Configuration") ],
_("Do you want to configure networking for your system?"),
[ __("Local LAN"), __("Dialup with modem"), __("Do not set up networking") ]);
}
-
if (/^Dialup/) {
$o->pppConfig;
} elsif (/^Do not/) {