summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-18 20:22:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-18 20:22:54 +0000
commite93e05749855bc3f1e0852b8103e47be541cd11c (patch)
treef90407cdb044af6c4f8a3357068a905482e52177
parenteb1e24199cf797acc3bd689ece81e561979dcf54 (diff)
downloaddrakx-backup-do-not-use-e93e05749855bc3f1e0852b8103e47be541cd11c.tar
drakx-backup-do-not-use-e93e05749855bc3f1e0852b8103e47be541cd11c.tar.gz
drakx-backup-do-not-use-e93e05749855bc3f1e0852b8103e47be541cd11c.tar.bz2
drakx-backup-do-not-use-e93e05749855bc3f1e0852b8103e47be541cd11c.tar.xz
drakx-backup-do-not-use-e93e05749855bc3f1e0852b8103e47be541cd11c.zip
since lba32 is the default in lilo.conf
- write "geometric" when lba32 is not set - don't write lba32 (useless)
-rw-r--r--perl-install/bootloader.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 57524dd1c..7ad0650ae 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -706,6 +706,7 @@ sub write_lilo_conf {
$lilo->{prompt} = $lilo->{timeout};
delete $lilo->{linear} if $lilo->{lba32};
+ $lilo->{geometric} = !$lilo->{lba32} && !$lilo->{linear} if arch() !~ /ia64/;
my $file2fullname = sub {
my ($file) = @_;
@@ -756,7 +757,7 @@ sub write_lilo_conf {
local $lilo->{default} = make_label_lilo_compatible($lilo->{default});
$lilo->{$_} and print F "$_=$lilo->{$_}" foreach qw(boot map install vga default keytable);
- $lilo->{$_} and print F $_ foreach qw(linear lba32 compact prompt nowarn restricted);
+ $lilo->{$_} and print F $_ foreach qw(linear geometric compact prompt nowarn restricted);
print F "append=\"$lilo->{append}\"" if $lilo->{append};
print F "password=", $lilo->{password} if $lilo->{password}; #- also done by msec
print F "timeout=", round(10 * $lilo->{timeout}) if $lilo->{timeout};