summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-01-25 03:07:56 +0000
committerdamien <damien@mandriva.com>2001-01-25 03:07:56 +0000
commit2ce82802515bd8cde72397fc7536e06dedef047c (patch)
treecdeb024169a6ab4d9188933a00a6ec2429615607
parentd95e8542cc39abb8bd30b13e91e84f3184e580ed (diff)
downloaddrakx-backup-do-not-use-2ce82802515bd8cde72397fc7536e06dedef047c.tar
drakx-backup-do-not-use-2ce82802515bd8cde72397fc7536e06dedef047c.tar.gz
drakx-backup-do-not-use-2ce82802515bd8cde72397fc7536e06dedef047c.tar.bz2
drakx-backup-do-not-use-2ce82802515bd8cde72397fc7536e06dedef047c.tar.xz
drakx-backup-do-not-use-2ce82802515bd8cde72397fc7536e06dedef047c.zip
disable steps 'packages choice', 'configure X', and 'configure' 'printer'
-rw-r--r--perl-install/install2.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 008e7295c..b4a707409 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -45,20 +45,20 @@ my (%installSteps, @orderedInstallSteps);
miscellaneous => [ __("Miscellaneous"), 1, 1, '$::beginner' ],
doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass" ],
formatPartitions => [ __("Format partitions"), 1, -1, '', "doPartitionDisks" ],
- choosePackages => [ __("Choose packages to install"), 1, -2, '$::beginner', "formatPartitions" ],
+ choosePackages => [ __("Choose packages to install"), 1, -2, '$::beginner || $o->{meta_class} eq "firewall"', "formatPartitions" ],
installPackages => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"] ],
configureNetwork => [ __("Configure networking"), 1, 1, '', "formatPartitions" ],
#- installCrypto => [ __("Cryptographic"), 1, 1, '!$::expert', "configureNetwork" ],
configureTimezone => [ __("Configure timezone"), 1, 1, '', "installPackages" ],
configureServices => [ __("Configure services"), 1, 1, '!$::expert', "installPackages" ],
- configurePrinter => [ __("Configure printer"), 1, 0, '', "installPackages" ],
+ configurePrinter => [ __("Configure printer"), 1, 0, '$o->{meta_class} eq "firewall"', "installPackages" ],
setRootPassword => [ __("Set root password"), 1, 1, '', "installPackages" ],
addUser => [ __("Add a user"), 1, 1, '', "installPackages" ],
arch() !~ /alpha/ ? (
createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "installPackages" ],
) : (),
setupBootloader => [ __("Install bootloader"), 1, 1, '', "installPackages" ],
- configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"] ],
+ configureX => [ __("Configure X"), 1, 1, '$o->{meta_class} eq "firewall"', ["formatPartitions", "setupBootloader"] ],
arch() !~ /alpha/ ? (
generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "installPackages" ],
) : (),