summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-05 14:29:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-05 14:29:16 +0000
commit31de738c99ce16ee26595d7bf2d6e9500a5a10b1 (patch)
tree30cb27258fcac641440869517e35e28f29177eb1 /perl-install/install_steps_interactive.pm
parentf093421759947c0e1020139c8b0bdb057105c074 (diff)
downloaddrakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.gz
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.bz2
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.xz
drakx-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm16
1 files changed, 5 insertions, 11 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 0291af4b4..523ccd59a 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -56,7 +56,7 @@ sub selectLanguage($) {
_("Please, choose a language to use."),
# the translation may be used for the help
[ lang::list() ],
- lang::lang2text($o->{lang}))) unless $::oo->{lang};
+ lang::lang2text($o->{lang})));
install_steps::selectLanguage($o);
#- $o->{useless_thing_accepted} = $o->ask_from_list_('',
@@ -105,11 +105,6 @@ sub selectInstallClass1 {
sub selectInstallClass($@) {
my ($o, @classes) = @_;
- if ($::oo->{installClass}) {
- delete $::o->{mouse}{unsafe} if $::oo->{oem};
- return install_steps::selectInstallClass($o);
- }
-
my %c = my @c = (
$::corporate ? () : (
_("Automated") => "beginner",
@@ -158,7 +153,7 @@ sub selectMouse {
my $name = $o->ask_from_list_('', _("Please, choose the type of your mouse."), [ mouse::names() ], $o->{mouse}{FULLNAME});
$o->{mouse} = mouse::name2mouse($name);
}
- $o->{mouse}{XEMU3} = 'yes' if $o->{mouse}{nbuttons} < 3; #- if $o->{mouse}{nbuttons} < 3 && $o->ask_yesorno('', _("Emulate third button?"), 1);
+ $o->{mouse}{XEMU3} = 'yes' if $o->{mouse}{nbuttons} < 3;
if ($force && $o->{mouse}{device} eq "ttyS") {
$o->set_help('selectSerialPort');
@@ -636,7 +631,7 @@ sub timeConfig {
my ($o, $f, $clicked) = @_;
require timezone;
- $o->{timezone}{timezone} = $o->ask_from_treelist('', _("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone}) if !$::oo->{oem} || $clicked;
+ $o->{timezone}{timezone} = $o->ask_from_treelist('', _("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone}) if $clicked;
$o->{timezone}{UTC} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{UTC}) if $::expert || $clicked;
install_steps::timeConfig($o, $f);
}
@@ -960,7 +955,6 @@ Do you want to keep XFree 3.3?"), 0) if $::expert;
{ local $::testing = 0; #- unset testing
local $::auto = $::beginner;
local $::noauto = $::expert && !$o->ask_yesorno('', _("Try to find PCI devices?"), 1);
- local $::skiptest = $::oo->{oem}; #- if lang is forced, assume no test (HACK)
$::noauto = $::noauto; #- no warning
Xconfigurator::main($o->{prefix}, $o->{X}, $o, $o->{allowFB}, bool($o->{pcmcia}), sub {
@@ -1055,7 +1049,7 @@ _("Some steps are not completed.
Do you really want to quit now?"), 0);
- install_any::unlockCdrom;
+ install_steps::exitInstall;
$o->ask_warn('',
_("Congratulations, installation is complete.
@@ -1065,7 +1059,7 @@ For information on fixes which are available for this release of Linux-Mandrake,
consult the Errata available from http://www.linux-mandrake.com/.
Information on configuring your system is available in the post
-install chapter of the Official Linux-Mandrake User's Guide.")) if $alldone && !$::g_auto_install && !$::oo->{oem};
+install chapter of the Official Linux-Mandrake User's Guide.")) if $alldone && !$::g_auto_install;
}