summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-12 23:40:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-12 23:40:48 +0000
commit2d92149a58246b77fc9427fbdd354baba4982a86 (patch)
tree485d2fa71681bf82ed4909b8b9bef56237a06608 /perl-install/install2.pm
parentbffb022e14866052364fb547cefd6cd6be87b14c (diff)
downloaddrakx-2d92149a58246b77fc9427fbdd354baba4982a86.tar
drakx-2d92149a58246b77fc9427fbdd354baba4982a86.tar.gz
drakx-2d92149a58246b77fc9427fbdd354baba4982a86.tar.bz2
drakx-2d92149a58246b77fc9427fbdd354baba4982a86.tar.xz
drakx-2d92149a58246b77fc9427fbdd354baba4982a86.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm10
1 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 90e711388..342255535 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -43,7 +43,7 @@ my (%installSteps, @orderedInstallSteps);
selectLanguage => [ __("Choose your language"), 1, 1, '' ],
selectInstallClass => [ __("Select installation class"), 1, 1, '' ],
setupSCSI => [ __("Hard drive detection"), 1, 0, '' ],
- selectMouse => [ __("Configure mouse"), 1, 1, '$::beginner', "selectInstallClass" ],
+ selectMouse => [ __("Configure mouse"), 1, 1, '', "selectInstallClass" ],
selectKeyboard => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass" ],
miscellaneous => [ __("Miscellaneous"), 1, 1, '$::beginner' ],
doPartitionDisks => [ __("Setup filesystems"), 1, 0, '$o->{lnx4win}', "selectInstallClass" ],
@@ -273,7 +273,6 @@ sub selectInstallClass {
sub doPartitionDisks {
$::live and return;
$o->{steps}{formatPartitions}{done} = 0;
- $o->{steps}{doPartitionDisks}{done} = 0;
$o->doPartitionDisksBefore;
$o->doPartitionDisks;
$o->doPartitionDisksAfter;
@@ -664,7 +663,12 @@ sub main {
while ($@) {
local $_ = $@;
$o->kill_action;
- /^setstep (.*)/ and $o->{step} = $1, $clicked = 1, redo MAIN;
+ if (/^setstep (.*)/) {
+ $o->{step} = $1;
+ $o->{steps}{$1}{done} = 0;
+ $clicked = 1;
+ redo MAIN;
+ }
/^theme_changed$/ and redo MAIN;
unless (/^already displayed/ || /^ask_from_list cancel/) {
eval { $o->errorInStep($_) };