From 416a326f1fc775511cf1eac2c04cca2a69d9961a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 15 Jul 2004 03:42:51 +0000
Subject: make_boot_splash is no good since the same initrd is used with or
 without vga=, so call add_boot_splash directly

---
 perl-install/bootloader.pm                | 9 ---------
 perl-install/standalone/bootloader-config | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index b31c53d81..19ec1eb61 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -125,15 +125,6 @@ sub mkinitrd {
     -e "$::prefix/$initrd";
 }
 
-sub make_boot_splash {
-    my ($initrd, $vga) = @_;
-
-    if ($vga) {
-	add_boot_splash($initrd, $vga);
-    } else {
-	remove_boot_splash($initrd);
-    }
-}
 sub remove_boot_splash {
     my ($initrd) = @_;
     run_program::rooted($::prefix, '/usr/share/bootsplash/scripts/remove-boot-splash', $initrd);
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 9c0662035..6e473a915 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -150,7 +150,7 @@ sub remove_entry() {
 #-###############################################################################
 sub update_splash() {
     foreach (@{$bootloader->{entries}}) {
-	bootloader::make_boot_splash($_->{initrd}, $_->{vga}) if $_->{initrd};
+	bootloader::add_boot_splash($_->{initrd}, $_->{vga}) if $_->{initrd};
     }
     bootloader::action($bootloader, 'when_config_changed', $hds) if !$no_launch;
 }
-- 
cgit v1.2.1