summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-16 17:30:46 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-16 17:30:46 +0000
commit81068b4c188a82c0ae486665617f385997e619cd (patch)
tree485035ca8ecab31f9012e5b38c59c25434a0b676 /perl-install/install2.pm
parent1609027e73313dc16a5109e3d3f56d6b1c9b20ad (diff)
downloaddrakx-backup-do-not-use-81068b4c188a82c0ae486665617f385997e619cd.tar
drakx-backup-do-not-use-81068b4c188a82c0ae486665617f385997e619cd.tar.gz
drakx-backup-do-not-use-81068b4c188a82c0ae486665617f385997e619cd.tar.bz2
drakx-backup-do-not-use-81068b4c188a82c0ae486665617f385997e619cd.tar.xz
drakx-backup-do-not-use-81068b4c188a82c0ae486665617f385997e619cd.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 5d864a3f0..d668b4b4a 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -188,7 +188,7 @@ my @installSteps = (
addUser => [ __("Add a user"), 1, 1, "doInstallStep" ],
createBootdisk => [ __("Create bootdisk"), 1, 0, "doInstallStep" ],
setupBootloader => [ __("Install bootloader"), 1, 1, "doInstallStep" ],
- configureX => [ __("Configure X"), 1, 0, "doInstallStep" ],
+ configureX => [ __("Configure X"), 1, 0, "formatPartitions" ],
exitInstall => [ __("Exit install"), 0, 0, "alldone" ],
);
@@ -369,7 +369,7 @@ sub selectInstallClass {
$::beginner = $o->{installClass} eq "beginner";
$o->{partitions} ||= $suggestedPartitions{$o->{installClass}};
- install_any::setPackages($o, \@install_classes) if $o->{steps}{choosePackages}{entered} > 1;
+ $o->setPackages(\@install_classes) if $o->{steps}{choosePackages}{entered} >= 1;
}
#------------------------------------------------------------------------------
@@ -428,8 +428,10 @@ sub formatPartitions {
}
#------------------------------------------------------------------------------
+#-PADTODO
sub choosePackages {
- $o->choosePackages($o->{packages}, $o->{compss}, \@install_classes);
+ $o->setPackages($o, \@install_classes) if $_[1] == 1;
+ $o->choosePackages($o->{packages}, $o->{compss});
$o->{packages}{$_}{selected} = 1 foreach @{$o->{base}};
}