summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-11 13:06:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-11 13:06:33 +0000
commit4b9f9119935f1e32812489c19913bd110b185d5e (patch)
tree3ccf67018203007de0dc0668befdf24f7993320c /perl-install/install2.pm
parent574a2b4e633e9de62414441e7245f3dce55fb060 (diff)
downloaddrakx-4b9f9119935f1e32812489c19913bd110b185d5e.tar
drakx-4b9f9119935f1e32812489c19913bd110b185d5e.tar.gz
drakx-4b9f9119935f1e32812489c19913bd110b185d5e.tar.bz2
drakx-4b9f9119935f1e32812489c19913bd110b185d5e.tar.xz
drakx-4b9f9119935f1e32812489c19913bd110b185d5e.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 53ff1412b..b8c5c079b 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -46,7 +46,7 @@ my (%installSteps, @orderedInstallSteps);
selectMouse => [ __("Configure mouse"), 1, 1, '$::beginner', "selectInstallClass" ],
selectKeyboard => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass" ],
miscellaneous => [ __("Miscellaneous"), 1, 1, '$::beginner' ],
- partitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass" ],
+ partitionDisks => [ __("Setup filesystems"), 1, 0, '$o->{lnx4win}', "selectInstallClass" ],
formatPartitions => [ __("Format partitions"), 1, -1, '', "partitionDisks" ],
choosePackages => [ __("Choose packages to install"), 1, -2, '$::beginner', "formatPartitions" ],
doInstallStep => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"] ],
@@ -58,11 +58,11 @@ my (%installSteps, @orderedInstallSteps);
setRootPassword => [ __("Set root password"), 1, 1, '', "formatPartitions" ],
addUser => [ __("Add a user"), 1, 1, '' ],
arch() !~ /alpha/ ? (
- createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "doInstallStep" ],
+ createBootdisk => [ __("Create a bootdisk"), 1, 0, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
) : (),
- setupBootloader => [ __("Install bootloader"), 1, 1, '', "doInstallStep" ],
+ setupBootloader => [ __("Install bootloader"), 1, 1, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"] ],
- generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::corporate || !$::expert', "doInstallStep" ],
+ generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "doInstallStep" ],
exitInstall => [ __("Exit install"), 0, 0, '$::beginner' ],
);
for (my $i = 0; $i < @installSteps; $i += 2) {