summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-04 18:33:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-04 18:33:56 +0000
commit7ce14e0f9d8541e16f3e4f88ea6d9b77c3bd19c7 (patch)
tree7d2c8f7a2d39221012e15451bfbd9bcfeb5953b6 /perl-install/install2.pm
parentd1f6612b2c28eb3014e65c200fb396bc318e4e09 (diff)
downloaddrakx-backup-do-not-use-7ce14e0f9d8541e16f3e4f88ea6d9b77c3bd19c7.tar
drakx-backup-do-not-use-7ce14e0f9d8541e16f3e4f88ea6d9b77c3bd19c7.tar.gz
drakx-backup-do-not-use-7ce14e0f9d8541e16f3e4f88ea6d9b77c3bd19c7.tar.bz2
drakx-backup-do-not-use-7ce14e0f9d8541e16f3e4f88ea6d9b77c3bd19c7.tar.xz
drakx-backup-do-not-use-7ce14e0f9d8541e16f3e4f88ea6d9b77c3bd19c7.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm3
1 files changed, 2 insertions, 1 deletions
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;