summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-04 20:29:24 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-04 20:29:24 +0000
commitbed52c9b16c8329cf4e1ce13f11ca41d09f05d4a (patch)
tree28084e0f0ad489a20670ae3210ad17b08f0bacca
parent9f4d9db50a2434acb6fde63ead071d9754e80f38 (diff)
downloaddrakx-bed52c9b16c8329cf4e1ce13f11ca41d09f05d4a.tar
drakx-bed52c9b16c8329cf4e1ce13f11ca41d09f05d4a.tar.gz
drakx-bed52c9b16c8329cf4e1ce13f11ca41d09f05d4a.tar.bz2
drakx-bed52c9b16c8329cf4e1ce13f11ca41d09f05d4a.tar.xz
drakx-bed52c9b16c8329cf4e1ce13f11ca41d09f05d4a.zip
no_comment
-rw-r--r--perl-install/install2.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 4b1c2bdad..e7e36a765 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -357,7 +357,7 @@ sub selectLanguage {
#------------------------------------------------------------------------------
sub selectKeyboard {
my ($clicked) = $_[0];
- return if $o->{installClass} eq "beginner" && !$clicked;
+ return if $::beginner && !$clicked;
$o->selectKeyboard;
#if we go back to the selectKeyboard, you must rewrite
@@ -378,7 +378,8 @@ sub selectPath {
sub selectInstallClass {
$o->selectInstallClass(@install_classes);
- $::expert = $o->{installClass} eq "expert";
+ $::expert = $o->{installClass} eq "expert";
+ $::beginner = $o->{installClass} eq "beginner";
$o->{partitions} = $suggestedPartitions{$o->{installClass}};
addToBeDone {
@@ -389,7 +390,7 @@ sub selectInstallClass {
#------------------------------------------------------------------------------
sub setupSCSI {
my ($clicked) = $_[0];
- $o->{autoSCSI} ||= $o->{installClass} eq "beginner";
+ $o->{autoSCSI} ||= $::beginner;
$o->setupSCSI($o->{autoSCSI} && !$clicked);
}