summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-23 17:30:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-23 17:30:36 +0000
commited76955e239d467e996ea3d20e8ae14c13db0253 (patch)
treef2166989b89a195fb7c55ec83bde252793f8d106 /perl-install/install_steps_interactive.pm
parent70e35bb3512a6b6022d784ccfcc752148d7cece7 (diff)
downloaddrakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.tar
drakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.tar.gz
drakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.tar.bz2
drakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.tar.xz
drakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm8
1 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e736afb74..beb193878 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -137,10 +137,8 @@ sub selectInstallClass($@) {
sub selectMouse {
my ($o, $force) = @_;
- my $name = $o->{mouse}{FULLNAME};
- if (!$name || $::expert || $force) {
- $name ||= "Generic Mouse (serial)";
- $name = $o->ask_from_list_('', _("What is the type of your mouse?"), [ mouse::names() ], $name);
+ if ($o->{mouse}{unsafe} || !$::beginner || $force) {
+ my $name = $o->ask_from_list_('', _("What is the type of your mouse?"), [ mouse::names() ], $o->{mouse}{FULLNAME});
$o->{mouse} = mouse::name2mouse($name);
}
$o->{mouse}{XEMU3} = 'yes' if $o->{mouse}{nbuttons} < 3; #- if $o->{mouse}{nbuttons} < 3 && $o->ask_yesorno('', _("Emulate third button?"), 1);
@@ -279,7 +277,7 @@ _("You need %dMB for a full install of the groups you selected.
You can go on anyway, but be warned that you won't get all packages", $max_size / sqr(1024)), 1) or goto &choosePackages
}
- my $size2install = $::beginner ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, min($max_size, $available * 0.9)) or goto &choosePackages;
+ my $size2install = $::beginner && $first_time ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, min($max_size, $available * 0.9)) or goto &choosePackages;
($o->{packages_}{ind}) =
pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, 1, $size2install, $o->{installClass});