summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-25 18:13:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-25 18:13:59 +0000
commit2f752b3d465e2d9338da2d266bb0ecefc08b2ba8 (patch)
tree6cdfa45d6d7b9713924a05baaae0cf018d75debc
parent89d08f21e3c4e02bf1fc872dd8397336b4f8e1da (diff)
downloaddrakx-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.tar
drakx-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.tar.gz
drakx-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.tar.bz2
drakx-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.tar.xz
drakx-2f752b3d465e2d9338da2d266bb0ecefc08b2ba8.zip
ignore-table is a global flag, so put it there (when needed)
-rw-r--r--perl-install/bootloader.pm4
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}) {
ec3f71469'>s/102errata/errata/. There will not be an 10.2, and errara.php3Funda Wang2005-03-211-2/+2 * s/101errata/102errata for the next release. We often forget this.Funda Wang2005-03-181-2/+2 * s/Netmask address/Netmask/. typo fixFunda Wang2005-03-121-1/+1 * updated pot filePablo Saratxaga2005-03-111-2/+2 * updated pot filePablo Saratxaga2005-03-111-30/+33 * fix kde mergeThierry Vignaud2005-03-101-1/+1 * further merge with KDEThierry Vignaud2005-03-101-1/+1 * remove duplicated stringThierry Vignaud2005-03-101-8/+0 * remove uneeded stringThierry Vignaud2005-03-101-4/+0 * merge translations from KDEThierry Vignaud2005-03-101-8/+8 * merge in new stringsThierry Vignaud2005-03-101-0/+112 * Added translation for "recommended" stringPablo Saratxaga2005-03-031-3169/+3973 * Fixing Bosnian translationVedran Ljubovic2004-10-101-5812/+6583 * updated pot filePablo Saratxaga2004-06-141-1930/+2047 * updated pot filePablo Saratxaga2004-04-011-1087/+1108 * updated po filesPablo Saratxaga2004-03-191-3686/+4706 * updated pot filePablo Saratxaga2004-02-191-14796/+16862 * fixed my previous bad entriesPablo Saratxaga2003-12-031-358/+659 * updated Bosnian, Basque, Farsi, Italian, Portuguese and Chinese filesPablo Saratxaga2003-09-211-434/+543 * updated pot filePablo Saratxaga2003-09-121-2173/+2894 * updated pot filePablo Saratxaga2003-08-131-1583/+2218 * changed the name of the russian phonetic layoutPablo Saratxaga2003-05-311-142/+255 * updated pot filePablo Saratxaga2003-05-161-13349/+13437 * updated Japanese file; updated pot filePablo Saratxaga2003-03-241-6/+11 * updated Bosnian and Romanian filesPablo Saratxaga2003-03-161-138/+32 * updated Bosnian and Vietnamese filesPablo Saratxaga2003-03-151-2604/+3081 * updated pot filePablo Saratxaga2003-03-121-87/+108 * updated pot filePablo Saratxaga2003-03-091-217/+217 * updated pot filePablo Saratxaga2003-03-071-351/+528 * updated pot filePablo Saratxaga2003-02-281-539/+753 * simplify translator job by propaging pixel english typo fixThierry Vignaud2003-02-17