summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2006-02-28 17:39:41 +0000
committerOlivier Blin <oblin@mandriva.org>2006-02-28 17:39:41 +0000
commit433b060edb39ed83ac0ca1e678d02104ffd1f141 (patch)
tree07a46495d6cc54a7f3a8ec59472bdd3e6fe8d29e
parent305e8718e9c1018d63139de7d9673a43244d96d6 (diff)
downloaddrakx-backup-do-not-use-433b060edb39ed83ac0ca1e678d02104ffd1f141.tar
drakx-backup-do-not-use-433b060edb39ed83ac0ca1e678d02104ffd1f141.tar.gz
drakx-backup-do-not-use-433b060edb39ed83ac0ca1e678d02104ffd1f141.tar.bz2
drakx-backup-do-not-use-433b060edb39ed83ac0ca1e678d02104ffd1f141.tar.xz
drakx-backup-do-not-use-433b060edb39ed83ac0ca1e678d02104ffd1f141.zip
ask license after language (#21266)
-rwxr-xr-xperl-install/standalone/finish-install2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 15f615267..1a20b5f25 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -107,8 +107,8 @@ sub call {
}
}
-call('license');
call('language');
+call('license');
call('keyboard');
call('timezone');
call('network');
opt">=> [ N_("Choose your keyboard"), 1, 1, '1', "selectInstallClass", 'keyboard' ], miscellaneous => [ N_("Security"), 1, 1, '', '', 'security' ], doPartitionDisks => [ N_("Partitioning"), 1, 0, '', "selectInstallClass", 'partition' ], formatPartitions => [ N_("Format partitions"), 1, -1, '1', "doPartitionDisks", 'partition' ], choosePackages => [ N_("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", 'partition' ], installPackages => [ N_("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"], '' ], setRootPassword => [ N_("Set root password"), 1, 1, '', "installPackages", 'rootpasswd' ], addUser => [ N_("Add a user"), 1, 1, '', "installPackages", 'user' ], configureNetwork => [ N_("Configure networking"), 1, 1, '1', "formatPartitions", 'network' ], setupBootloader => [ N_("Install bootloader"), 1, 0, '', "installPackages", 'bootloader' ], configureX => [ N_("Configure X"), 1, 1, '1', ["formatPartitions", "setupBootloader"], 'X' ], summary => [ N_("Summary"), 1, 0, '', "installPackages", 'summary' ], configureServices => [ N_("Configure services"), 1, 1, '!$::expert', "installPackages", 'services' ], installUpdates => [ N_("Install system updates"), 1, 1, '', ["installPackages", "configureNetwork", "summary"], '' ], exitInstall => [ N_("Exit install"), 0, 0, '', '', 'exit' ], ); for (my $i = 0; $i < @installSteps; $i += 2) { my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] }; $h{next} = $installSteps[$i + 2]; $h{entered} = 0; $h{onError} = $installSteps[$i + 2 * $h{onError}]; $h{reachable} = !$h{needs}; $installSteps{$installSteps[$i]} = \%h; push @orderedInstallSteps, $installSteps[$i]; } $installSteps{first} = $installSteps[0]; } 1;