diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-02-25 18:13:59 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-02-25 18:13:59 +0000 |
commit | 2f752b3d465e2d9338da2d266bb0ecefc08b2ba8 (patch) | |
tree | 6cdfa45d6d7b9713924a05baaae0cf018d75debc | |
parent | 89d08f21e3c4e02bf1fc872dd8397336b4f8e1da (diff) | |
download | drakx-backup-do-not-use-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.tar drakx-backup-do-not-use-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.tar.gz drakx-backup-do-not-use-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.tar.bz2 drakx-backup-do-not-use-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.tar.xz drakx-backup-do-not-use-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.zip |
ignore-table is a global flag, so put it there (when needed)
-rw-r--r-- | perl-install/bootloader.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 7d4dcdc89..a9d09470b 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -742,6 +742,8 @@ sub write_lilo_conf { print F "message=/boot/message" if (arch() !~ /ia64/); print F "menu-scheme=wb:bw:wb:bw" if (arch() !~ /ia64/); + print F "ignore-table" if grep { $_->{unsafe} && $_->{table} } @{$lilo->{entries}}; + foreach (@{$lilo->{entries}}) { print F "$_->{type}=", $file2fullname->($_->{kernel_or_dev}); print F "\tlabel=", make_label_lilo_compatible($_->{label}); @@ -755,7 +757,7 @@ sub write_lilo_conf { print F "\tread-only" if !$_->{'read-write'}; } else { print F "\ttable=$_->{table}" if $_->{table}; - print F $_->{table} ? "\tignore-table" : "\tunsafe" if $_->{unsafe}; + print F "\tunsafe" if $_->{unsafe} && !$_->{table}; if (my ($dev) = $_->{table} =~ m|/dev/(.*)|) { if ($dev2bios{$dev}) { |