From 2eaff28c110327ec1a3f693c66b84428c7c933e2 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 5 Apr 2012 17:37:30 +0000
Subject: add boot splash to initrd only once (pterjan)

---
 perl-install/bootloader.pm | 10 +++++++++-
 perl-install/install/NEWS  |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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
-- 
cgit v1.2.1