summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-10-02 22:18:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-10-02 22:18:19 +0000
commit1198912b180ca6052146f52302123d091adcf3c6 (patch)
treefa1a3e13e0a8b49d13f196807c6c52f075b4d8c3 /perl-install/install2.pm
parent6922b33f6d34f7937b2327035ed4da6c585a2cd7 (diff)
downloaddrakx-1198912b180ca6052146f52302123d091adcf3c6.tar
drakx-1198912b180ca6052146f52302123d091adcf3c6.tar.gz
drakx-1198912b180ca6052146f52302123d091adcf3c6.tar.bz2
drakx-1198912b180ca6052146f52302123d091adcf3c6.tar.xz
drakx-1198912b180ca6052146f52302123d091adcf3c6.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 f78961b30..533d9fd51 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -43,7 +43,7 @@ my (%installSteps, @orderedInstallSteps);
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" ],
+ doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass" ],
formatPartitions => [ __("Format partitions"), 1, -1, '', "doPartitionDisks" ],
choosePackages => [ __("Choose packages to install"), 1, -2, '$::beginner', "formatPartitions" ],
installPackages => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"] ],
@@ -55,9 +55,9 @@ my (%installSteps, @orderedInstallSteps);
setRootPassword => [ __("Set root password"), 1, 1, '', "installPackages" ],
addUser => [ __("Add a user"), 1, 1, '', "installPackages" ],
arch() !~ /alpha/ ? (
- createBootdisk => [ __("Create a bootdisk"), 1, 0, '$::o->{lnx4win} && !$::expert', "installPackages" ],
+ createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "installPackages" ],
) : (),
- setupBootloader => [ __("Install bootloader"), 1, 1, '$::o->{lnx4win} && !$::expert', "installPackages" ],
+ setupBootloader => [ __("Install bootloader"), 1, 1, '', "installPackages" ],
configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"] ],
arch() !~ /alpha/ ? (
generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "installPackages" ],
@@ -507,7 +507,7 @@ sub main {
kickstart => sub { $::auto_install = $v },
auto_install => sub { $::auto_install = $v },
simple_themes => sub { $o->{simple_themes} = 1 },
-#- useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 },
+ useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 },
alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 },
fdisk => sub { $o->{partitioning}{fdisk} = 1 },
g_auto_install => sub { $::testing = $::g_auto_install = 1; $o->{partitioning}{auto_allocate} = 1 },