summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-06 15:30:56 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-06 15:30:56 +0000
commit2fd889c2d9cc5fe117a81dd04c2166d267b5ef71 (patch)
treec6df943e330bedc7770f7319c82e07df95498735
parente2d5910163e6a0c415ea08a3b4dc7a047803d963 (diff)
downloaddrakx-backup-do-not-use-2fd889c2d9cc5fe117a81dd04c2166d267b5ef71.tar
drakx-backup-do-not-use-2fd889c2d9cc5fe117a81dd04c2166d267b5ef71.tar.gz
drakx-backup-do-not-use-2fd889c2d9cc5fe117a81dd04c2166d267b5ef71.tar.bz2
drakx-backup-do-not-use-2fd889c2d9cc5fe117a81dd04c2166d267b5ef71.tar.xz
drakx-backup-do-not-use-2fd889c2d9cc5fe117a81dd04c2166d267b5ef71.zip
no_comment
-rw-r--r--perl-install/Xconfigurator.pm2
-rw-r--r--perl-install/install2.pm46
-rw-r--r--perl-install/install_steps_interactive.pm3
-rw-r--r--perl-install/share/compssList2
4 files changed, 27 insertions, 26 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index c3214b184..7359b7e9a 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -7,7 +7,7 @@ use vars qw($in $install $resolution_wanted @depths @monitorSize2resolution @hsy
use pci_probing::main;
use common qw(:common :file :functional :system);
use log;
-
+use run_program;
use Xconfigurator_consts;
use my_gtk qw(:wrappers);
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 294601366..d4a167bbc 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -34,29 +34,29 @@ use run_program;
#-######################################################################################
#- Steps table
#-######################################################################################
-my @installStepsFields = qw(text redoable onError needs entered reachable toBeDone help next done);
+my @installStepsFields = qw(text redoable onError beginnerHidden needs entered reachable toBeDone help next done);
my @installSteps = (
- selectLanguage => [ __("Choose your language"), 1, 1 ],
- selectInstallClass => [ __("Select installation class"), 1, 1 ],
- setupSCSI => [ __("Setup SCSI"), 1, 0 ],
- selectPath => [ __("Choose install or upgrade"), 0, 0, "selectInstallClass" ],
- selectMouse => [ __("Configure mouse"), 1, 1, "selectPath" ],
- selectKeyboard => [ __("Choose your keyboard"), 1, 1, "selectPath" ],
- partitionDisks => [ __("Setup filesystems"), 1, 0, "selectPath" ],
- formatPartitions => [ __("Format partitions"), 1, -1, "partitionDisks" ],
- choosePackages => [ __("Choose packages to install"), 1, 1, "selectPath" ],
- doInstallStep => [ __("Install system"), 1, -1 ],
- miscellaneous => [ __("Miscellaneous"), 1, 1 ],
- configureNetwork => [ __("Configure networking"), 1, 1, "formatPartitions" ],
- configureTimezone => [ __("Configure timezone"), 1, 1, "doInstallStep" ],
-#- configureServices => [ __("Configure services"), 0, 0 ],
- configurePrinter => [ __("Configure printer"), 1, 0, "doInstallStep" ],
- setRootPassword => [ __("Set root password"), 1, 1, "formatPartitions" ],
- addUser => [ __("Add a user"), 1, 1, "doInstallStep" ],
- createBootdisk => [ __("Create a bootdisk"), 1, 0, "doInstallStep" ],
- setupBootloader => [ __("Install bootloader"), 1, 1, "doInstallStep" ],
- configureX => [ __("Configure X"), 1, 0, ["formatPartitions", "setupBootloader"] ],
- exitInstall => [ __("Exit install"), 0, 0 ],
+ selectLanguage => [ __("Choose your language"), 1, 1, 0 ],
+ selectInstallClass => [ __("Select installation class"), 1, 1, 0 ],
+ setupSCSI => [ __("Setup SCSI"), 1, 0, 0 ],
+ selectPath => [ __("Choose install or upgrade"), 0, 0, 0, "selectInstallClass" ],
+ selectMouse => [ __("Configure mouse"), 1, 1, 0, "selectPath" ],
+ selectKeyboard => [ __("Choose your keyboard"), 1, 1, 1, "selectPath" ],
+ partitionDisks => [ __("Setup filesystems"), 1, 0, 0, "selectPath" ],
+ formatPartitions => [ __("Format partitions"), 1, -1, 0, "partitionDisks" ],
+ choosePackages => [ __("Choose packages to install"), 1, 1, 0, "selectPath" ],
+ doInstallStep => [ __("Install system"), 1, -1, 0 ],
+ miscellaneous => [ __("Miscellaneous"), 1, 1, 1 ],
+ configureNetwork => [ __("Configure networking"), 1, 1, 1, "formatPartitions" ],
+ configureTimezone => [ __("Configure timezone"), 1, 1, 0, "doInstallStep" ],
+#- configureServices => [ __("Configure services"), 0, 0, 0 ],
+ configurePrinter => [ __("Configure printer"), 1, 0, 0, "doInstallStep" ],
+ setRootPassword => [ __("Set root password"), 1, 1, 0, "formatPartitions" ],
+ addUser => [ __("Add a user"), 1, 1, 0, "doInstallStep" ],
+ createBootdisk => [ __("Create a bootdisk"), 1, 0, 0, "doInstallStep" ],
+ setupBootloader => [ __("Install bootloader"), 1, 1, 0, "doInstallStep" ],
+ configureX => [ __("Configure X"), 1, 0, 0, ["formatPartitions", "setupBootloader"] ],
+ exitInstall => [ __("Exit install"), 0, 0, 1 ],
);
my (%installSteps, %upgradeSteps, @orderedInstallSteps, @orderedUpgradeSteps);
@@ -141,7 +141,7 @@ $o = $::o = {
authentification => { md5 => 1, shadow => 1 },
lang => 'en',
isUpgrade => 0,
- installClass => "beginner",
+#- installClass => "beginner",
timezone => {
#- timezone => "Europe/Paris",
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d2652c092..72468ffcc 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -105,7 +105,7 @@ sub selectInstallClass($@) {
);
my $installClass = ${{reverse %c}}{$o->ask_from_list(_("Install Class"),
_("What installation class do you want?"),
- [ map { $c{$_} } @c ], $c{$o->{installClass}} || $c{specific})};
+ [ map { $c{$_} } @c ], $c{$o->{installClass}} || $c{beginner})};
$::expert = $installClass eq "expert";
$::beginner = $installClass eq "beginner";
@@ -113,6 +113,7 @@ sub selectInstallClass($@) {
$o->{installClass} = $installClass;
} else {
my %c = (
+ normal => _("Normal"),
developer => _("Developement"),
server => _("Server"),
);
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 9ab0df1f0..3a32666d2 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -1,4 +1,4 @@
- beginner server developer
+ normal server developer
packages