diff options
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/steps.pm | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index db48f2d60..05a6b1597 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -544,7 +544,7 @@ sub main { MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) { $o->{steps}{$o->{step}}{entered}++; $o->enteringStep($o->{step}); - $o->{steps}{$o->{step}}{icon} && $o->{steps}{$o->{step}}{icon} != 'default' and $o->{icon} = $o->{steps}{$o->{step}}{icon}; + $o->{steps}{$o->{step}}{icon} and $o->{icon} = $o->{steps}{$o->{step}}{icon}; eval { &{$install2::{$o->{step}}}($clicked || $o->{steps}{$o->{step}}{noauto}, $o->{steps}{$o->{step}}{entered}, diff --git a/perl-install/steps.pm b/perl-install/steps.pm index 9fca2354f..07c23bf50 100644 --- a/perl-install/steps.pm +++ b/perl-install/steps.pm @@ -11,27 +11,27 @@ use common; my @installStepsFields = qw(text redoable onError hidden needs icon); #entered reachable toBeDone next done; my @installSteps = ( - selectLanguage => [ __("Choose your language"), 1, 1, '', '', 'default' ], - selectInstallClass => [ __("Select installation class"), 1, 1, '', '', 'default' ], + selectLanguage => [ __("Choose your language"), 1, 1, '', '', '' ], + selectInstallClass => [ __("Select installation class"), 1, 1, '', '', '' ], setupSCSI => [ __("Hard drive detection"), 1, 0, '', '', 'harddrive' ], selectMouse => [ __("Configure mouse"), 1, 1, '', "selectInstallClass", 'mouse' ], selectKeyboard => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass", 'keyboard' ], miscellaneous => [ __("Security"), 1, 1, '!$::expert', '', 'security' ], - doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass", 'default' ], - formatPartitions => [ __("Format partitions"), 1, -1, '$o->{isUpgrade}', "doPartitionDisks", 'default' ], - choosePackages => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", 'default' ], + doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass", '' ], + formatPartitions => [ __("Format partitions"), 1, -1, '$o->{isUpgrade}', "doPartitionDisks", '' ], + choosePackages => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", '' ], installPackages => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"], '' ], setRootPassword => [ __("Set root password"), 1, 1, '', "installPackages", 'rootpasswd' ], addUser => [ __("Add a user"), 1, 1, '', "installPackages", 'user' ], configureNetwork => [ __("Configure networking"), 1, 1, '', "formatPartitions", 'network' ], - summary => [ __("Summary"), 1, 0, '', "installPackages", 'default' ], + summary => [ __("Summary"), 1, 0, '', "installPackages", '' ], configureServices => [ __("Configure services"), 1, 1, '!$::expert', "installPackages", 'services' ], if_((arch() !~ /alpha/) && (arch() !~ /ppc/), createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "installPackages", 'bootdisk' ], ), setupBootloader => [ __("Install bootloader"), 1, 1, '', "installPackages", 'bootloader' ], configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"], 'X' ], - exitInstall => [ __("Exit install"), 0, 0, '!$::expert && !$::live', '', 'default' ], + exitInstall => [ __("Exit install"), 0, 0, '!$::expert && !$::live', '', '' ], ); for (my $i = 0; $i < @installSteps; $i += 2) { my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] }; |