diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-09-15 20:42:47 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-09-15 20:42:47 +0000 |
| commit | 851338fe8bf4c8d057984431b542b333cbad4b8e (patch) | |
| tree | 7029da4dde591025d410100a9b1b126967ba2f76 /perl-install/install_steps_interactive.pm | |
| parent | 91608779ad460d1481bec34e39db4661b4950441 (diff) | |
| download | drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.gz drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.bz2 drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.xz drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 11825436e..ab32dc452 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -154,7 +154,6 @@ sub selectMouse { $o->{mouse} = $o->ask_from_listf_('', _("Please, choose the type of your mouse."), sub { $_[0]{FULLNAME} }, [ mouse::list ], $o->{mouse}) if $force; - $o->{mouse}{XEMU3} = 'yes' if $o->{mouse}{nbuttons} < 3; if ($force && $o->{mouse}{device} eq "ttyS") { $o->set_help('selectSerialPort'); @@ -248,7 +247,7 @@ Continue at your own risk!")); \&partition_table_raw::description, [ install_any::find_root_parts($o->{hds}, $o->{prefix}) ]) or die "setstep exitInstall\n"; install_any::use_root_part($o->{fstab}, $p, $o->{prefix}); - } elsif ($::expert) { + } elsif ($::expert && ref($o) =~ /gtk/) { install_interactive::partition_with_diskdrake($o, $o->{hds}); } else { install_interactive::partitionWizard($o); @@ -276,21 +275,23 @@ sub choosePartitionsToFormat($$) { return if $::beginner && 0 == grep { ! $_->{toFormat} } @l; - $_->{toFormat} ||= $_->{toFormatUnsure} foreach @l; - log::l("preparing to format $_->{mntpoint}") foreach grep { $_->{toFormat} } @l; + my %toFormat = map { $_ => $_->{toFormat} || $_->{toFormatUnsure} } @l; my %label; - $label{$_} = sprintf("%s (%s)", + $label{$_} = sprintf("%s %s", isSwap($_) ? type2name($_->{type}) : $_->{mntpoint}, - isLoopback($_) ? loopback::file($_) : $_->{device}) foreach @l; + isLoopback($_) ? + $::expert && loopback::file($_) : + "(" . partition_table_raw::description($_) . ")") foreach @l; $o->ask_many_from_list_ref('', _("Choose the partitions you want to format"), [ map { $label{$_} } @l ], - [ map { \$_->{toFormat} } @l ]) or die "cancel"; + [ map { \$toFormat{$_} } @l ]) or die "cancel"; @l = grep { $_->{toFormat} && !isLoopback($_) && !isReiserfs($_) } @l; $o->ask_many_from_list_ref('', _("Check bad blocks?"), [ map { $label{$_} } @l ], [ map { \$_->{toFormatCheck} } @l ]) or goto &choosePartitionsToFormat if $::expert; + $_->{toFormat} = $toFormat{$_} foreach @l; } @@ -807,7 +808,7 @@ sub miscellaneous { _("Miscellaneous questions"), [ _("Use hard drive optimisations?") => { val => \$u->{HDPARM}, type => 'bool', text => _("(may cause data corruption)") }, _("Choose security level") => { val => \$s, list => [ map { $l{$_} } ikeys %l ] }, -_("Precise RAM size if needed (found %d MB)", availableRam / 1024 + 1) => \$u->{memsize}, #- add three for correction. +_("Precise RAM size if needed (found %d MB)", availableRamMB()) => \$u->{memsize}, arch() !~ /^sparc/ ? ( _("Removable media automounting") => { val => \$o->{useSupermount}, type => 'bool', text => 'supermount' }, ) : (), $::expert ? ( |