diff options
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_interactive.pm | 12 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 16 |
4 files changed, 17 insertions, 16 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 1e604d85b..a74ce59a7 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -193,7 +193,7 @@ You can add some more or change the existing ones."), my @l; if ($e->{type} eq "image") { @l = ( -_("Image") => { val => \$e->{kernel_or_dev}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/vmlinuz*") ] }, +_("Image") => { val => \$e->{kernel_or_dev}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/vmlinuz*") ], not_edit => 0 }, _("Root") => { val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, _("Append") => \$e->{append}, _("Initrd") => { val => \$e->{initrd}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/initrd*") ] }, diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 85c6203f3..84c86bdda 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -236,7 +236,7 @@ sub selectKeyboard { $::live and return; my ($clicked) = $_[0]; - return unless $o->{isUpgrade} || !$::beginner || $clicked; + return if !$o->{isUpgrade} && $::beginner && !$clicked; $o->{keyboard} = keyboard::read($o->{prefix}) if $o->{isUpgrade} && !$clicked && $o->{keyboard_unsafe}; $o->selectKeyboard; @@ -273,6 +273,7 @@ sub selectInstallClass { sub doPartitionDisks { $::live and return; $o->{steps}{formatPartitions}{done} = 0; + $o->{steps}{doPartitionDisks}{done} = 0; $o->doPartitionDisksBefore; $o->doPartitionDisks; $o->doPartitionDisksAfter; diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index 8d40e3f49..f5fe63069 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -74,7 +74,7 @@ sub partitionWizardSolutions { fs::df($_) foreach @fats; if (my @ok_forloopback = sort { $b->{free} <=> $a->{free} } grep { $_->{free} > $min_linux + $min_freewin } @fats) { $solutions{loopback} = - [ 5 - @fats, _("Use the FAT partition for loopback"), + [ -10 - @fats, _("Use the FAT partition for loopback"), sub { my ($s_root, $s_swap); my $part = $o->ask_from_listf('', _("Which partition do you want to use to put Linux4Win?"), \&partition_table_raw::description, \@ok_forloopback) or return; @@ -132,13 +132,12 @@ When sure, press Ok.")) or return; } if (@$fstab && !$readonly) { - require diskdrake; $solutions{wipe_drive} = - [ 10, fsedit::is_one_big_fat($hds) ? _("Remove Windows(TM)") : _("Take over the hard drive"), + [ 10, fsedit::is_one_big_fat($hds) ? _("Remove Windows(TM)") : _("Erase entire disk"), sub { my $hd = $o->ask_from_listf('', _("You have more than one hard drive, which one do you install linux on?"), \&partition_table_raw::description, $hds) or return; - $o->ask_okcancel('', _("All existing partitions and their data will be lost on drive %s", $hd->{device})) or return; + $o->ask_okcancel('', _("ALL existing partitions and their data will be lost on drive %s", partition_table_raw::description($hd))) or return; partition_table_raw::zero_MBR($hd); fsedit::auto_allocate($hds, $o->{partitions}); 1; @@ -146,7 +145,8 @@ When sure, press Ok.")) or return; } if (!$readonly && ref($o) =~ /gtk/) { #- diskdrake only available in gtk for now - $solutions{diskdrake} = [ 0, _("Use diskdrake"), sub { partition_with_diskdrake($o, $hds, 'nowizard') } ]; + require diskdrake; + $solutions{diskdrake} = [ 0, ($::beginner ? _("Expert mode"), _("Use diskdrake")), sub { partition_with_diskdrake($o, $hds, 'nowizard') } ]; } $solutions{fdisk} = @@ -175,7 +175,7 @@ sub partitionWizard { my @solutions = sort { $b->[0] <=> $a->[0] } values %solutions; - my $level = $::beginner ? 2 : -9999; + my $level = $::beginner ? 0 : $::expert ? -9999 : -10; my @sol = grep { $_->[0] >= $level } @solutions; @solutions = @sol if @sol > 1; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index f8a1f58ad..7c72309a6 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -76,14 +76,14 @@ translated etc. that varies from language to language).") if $o->{lang} !~ /^en/ #------------------------------------------------------------------------------ sub selectKeyboard($) { my ($o, $clicked) = @_; - if (!$::beginner || $clicked) { - $o->{keyboard} = $o->ask_from_listf_(_("Keyboard"), - _("Please, choose your keyboard layout."), - \&keyboard::keyboard2text, - [ keyboard::xmodmaps() ], - $o->{keyboard}); - delete $o->{keyboard_unsafe}; - } + + $o->{keyboard} = $o->ask_from_listf_(_("Keyboard"), + _("Please, choose your keyboard layout."), + \&keyboard::keyboard2text, + [ keyboard::xmodmaps() ], + $o->{keyboard}); + delete $o->{keyboard_unsafe}; + if ($::expert && ref($o) !~ /newt/) { #- newt is buggy with big windows :-( my %langs; $langs{$_} = 1 foreach @{$o->{langs}}; $o->ask_many_from_list_ref('', |