summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-27 23:27:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-27 23:27:56 +0000
commit0499c68e443c74e470e2fd5027524717297d033d (patch)
tree9b8e98fa64e5a0819d5b7b07a37cb8682bc4a61d
parentab005c9baf1c6065d4fdfad3983ff37fd6acb714 (diff)
downloaddrakx-0499c68e443c74e470e2fd5027524717297d033d.tar
drakx-0499c68e443c74e470e2fd5027524717297d033d.tar.gz
drakx-0499c68e443c74e470e2fd5027524717297d033d.tar.bz2
drakx-0499c68e443c74e470e2fd5027524717297d033d.tar.xz
drakx-0499c68e443c74e470e2fd5027524717297d033d.zip
:x
-rw-r--r--perl-install/any.pm1
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/install2.pm2
3 files changed, 1 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index bb75375b6..33e3cb17b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -162,7 +162,6 @@ sub setupBootloader {
{ label => _("Bootloader installation"), val => \$silo_install_lang, list => \@silo_install_lang },
) : if_(arch() !~ /ia64/,
{ label => _("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } (@$hds, grep { !isFat($_) } @$fstab)), detect_devices::floppies_dev() ], not_edit => !$::expert },
-{ label => _("LBA (doesn't work on old BIOSes)"), val => \$b->{lba32}, type => "bool", text => "lba", advanced => 1 },
{ label => _("Compact"), val => \$b->{compact}, type => "bool", text => _("compact"), advanced => 1 },
{ label => _("Video mode"), val => \$b->{vga}, list => [ keys %bootloader::vga_modes ], not_edit => !$::expert, format => sub { $bootloader::vga_modes{$_[0]} }, advanced => 1 },
),
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index feac63642..743d8aafd 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -362,7 +362,6 @@ sub suggest {
timeout => $onmbr && 10,
nowarn => 1,
if_(arch() !~ /ia64/,
- lba32 => 1,
boot => "/dev/" . ($onmbr ? $hds->[0]{device} : fsedit::get_root($fstab, 'boot')->{device}),
map => "/boot/map",
),
@@ -706,9 +705,6 @@ sub write_lilo_conf {
my ($lilo, $fstab, $hds) = @_;
$lilo->{prompt} = $lilo->{timeout};
- delete $lilo->{linear} if $lilo->{lba32};
- $lilo->{geometric} = !$lilo->{lba32} && !$lilo->{linear} if arch() !~ /ia64/;
-
my $file2fullname = sub {
my ($file) = @_;
if (arch() =~ /ia64/) {
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 5dc3bd2aa..fdd1696f4 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -33,7 +33,7 @@ use fs;
#-the variable $default)
#-#######################################################################################
$o = $::o = {
-# bootloader => { linear => 0, lba32 => 1, message => 1, timeout => 5, restricted => 0 },
+# bootloader => { linear => 0, message => 1, timeout => 5, restricted => 0 },
mkbootdisk => 0, #- no mkbootdisk if 0 or undef, find a floppy with 1, or fd1
#- packages => [ qw() ],
partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0 }, #-, readonly => 0 },