summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-18 09:21:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-18 09:21:18 +0000
commite8d6f43f2aef5c0f5d4dc7951a50eb39527822b8 (patch)
tree87b7d9ea67fa7b003fce8f0ab9c1166b726b07af
parentabcb9fce7cc185fd3bc49c779a461f81432df0a2 (diff)
downloaddrakx-e8d6f43f2aef5c0f5d4dc7951a50eb39527822b8.tar
drakx-e8d6f43f2aef5c0f5d4dc7951a50eb39527822b8.tar.gz
drakx-e8d6f43f2aef5c0f5d4dc7951a50eb39527822b8.tar.bz2
drakx-e8d6f43f2aef5c0f5d4dc7951a50eb39527822b8.tar.xz
drakx-e8d6f43f2aef5c0f5d4dc7951a50eb39527822b8.zip
- do not create alt_windows unless needed
(regression introduced on 2007-11-26) (#37722)
-rw-r--r--perl-install/bootloader.pm3
-rw-r--r--perl-install/install/NEWS2
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 0a0cca5bc..abaee89e1 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -474,6 +474,9 @@ sub same_entries {
foreach (uniq(keys %$a, keys %$b)) {
if (member($_, 'label', 'append', 'mapdrive', 'readonly', 'makeactive', 'verbatim')) {
next;
+ } elsif ($_ eq 'grub_root' && (!$a->{$_} || !$b->{$_})) {
+ #- grub_root is mostly internal stuff. if it misses, it's ok
+ next;
} else {
next if $a->{$_} eq $b->{$_};
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4cd7d0aa6..b22b6c190 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not create alt_windows unless needed
+ (regression introduced on 2007-11-26) (#37722)
- install linuxwacom if needed
- load disk/ide before disk/scsi, or else sata_sis may be loaded for a
SATA controller and trigger pata_sis loading before sis5513 is loaded,