summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-09 11:38:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-09 11:38:02 +0000
commit4ce69234e573c58002f3d1a9f361489410e883b2 (patch)
treee9f590e2fd57d708f76c3249a442864a2b50a365 /perl-install/install2.pm
parent06f02f9536b2a9fb1283dd33c441b5e66da23551 (diff)
downloaddrakx-backup-do-not-use-4ce69234e573c58002f3d1a9f361489410e883b2.tar
drakx-backup-do-not-use-4ce69234e573c58002f3d1a9f361489410e883b2.tar.gz
drakx-backup-do-not-use-4ce69234e573c58002f3d1a9f361489410e883b2.tar.bz2
drakx-backup-do-not-use-4ce69234e573c58002f3d1a9f361489410e883b2.tar.xz
drakx-backup-do-not-use-4ce69234e573c58002f3d1a9f361489410e883b2.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 2bcd3ba97..9ad6af9b6 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -252,6 +252,7 @@ sub selectKeyboard {
#- if we go back to the selectKeyboard, you must rewrite
addToBeDone {
+ lang::write($o->{prefix});
keyboard::write($o->{prefix}, $o->{keyboard});
} 'doInstallStep' unless $::g_auto_install;
}
@@ -287,7 +288,7 @@ sub setupSCSI {
sub partitionDisks {
return
$o->{fstab} = [
- { device => "loop7", type => 0x83, size => ((cat_('/dos/lnx4win/size.txt'))[0]*2048), mntpoint => "/", isFormatted => 1, isMounted => 1 },
+ { device => "loop7", type => 0x83, size => 2048 * cat_('/dos/lnx4win/size.txt'), mntpoint => "/", isFormatted => 1, isMounted => 1 },
{ device => "/initrd/dos/lnx4win/swapfile", type => 0x82, mntpoint => "swap", isFormatted => 1, isMounted => 1 },
] if $o->{lnx4win};
return if $o->{isUpgrade};
@@ -361,7 +362,6 @@ sub choosePackages {
if ($_[1] == 1) {
$o->{compssUsersChoice}{$_} = 1 foreach @{$o->{compssUsersSorted}}, 'Miscellaneous';
$o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|el|ko|th|vi|zh/; #- gnome handles much this fonts much better
-
}
$o->choosePackages($o->{packages}, $o->{compss},
$o->{compssUsers}, $o->{compssUsersSorted}, $_[1] == 1);
@@ -617,8 +617,7 @@ sub main {
modules::read_stage1_conf("/tmp/conf.modules");
modules::read_already_loaded();
- eval { modules::load("ide-disk") };
- eval { modules::load("sd_mod") };
+ eval { modules::load($_) } foreach qw(ide-probe ide-disk sd_mod af_packet);
install_any::lnx4win_preinstall() if $o->{lnx4win};
#-the main cycle