summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-05 17:37:30 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-05 17:37:30 +0000
commit2eaff28c110327ec1a3f693c66b84428c7c933e2 (patch)
tree8f251920bdb9b52c424f3772e6311a3fd8ece410
parentf225445b222eb408d318a4af15bd62ca0c38acaf (diff)
downloaddrakx-2eaff28c110327ec1a3f693c66b84428c7c933e2.tar
drakx-2eaff28c110327ec1a3f693c66b84428c7c933e2.tar.gz
drakx-2eaff28c110327ec1a3f693c66b84428c7c933e2.tar.bz2
drakx-2eaff28c110327ec1a3f693c66b84428c7c933e2.tar.xz
drakx-2eaff28c110327ec1a3f693c66b84428c7c933e2.zip
add boot splash to initrd only once (pterjan)
-rw-r--r--perl-install/bootloader.pm10
-rw-r--r--perl-install/install/NEWS1
2 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 1613cd0a2..9816a92b1 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -161,8 +161,16 @@ sub add_boot_splash {
sub update_splash {
my ($bootloader) = @_;
+ my %real_initrd_entries;
foreach (@{$bootloader->{entries}}) {
- add_boot_splash($_->{initrd}, $_->{vga} || $bootloader->{vga}) if $_->{initrd};
+ if ($_->{initrd}) {
+ my $initrd = expand_symlinks($_->{initrd});
+ $real_initrd_entries{$initrd} = $_;
+ }
+ }
+ foreach (values %real_initrd_entries) {
+ log::l("add boot splash to $_->{initrd}\n");
+ add_boot_splash($_->{initrd}, $_->{vga} || $bootloader->{vga});
}
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index ab9405c79..bc2c10bc0 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- add boot splash to initrd only once
- log install settings (mga#3467 & mga#5209)
- do not set security level to its own value on upgrade (mga#5147)
- do not crash if msec isn't installed