summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-15 03:42:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-15 03:42:51 +0000
commit416a326f1fc775511cf1eac2c04cca2a69d9961a (patch)
treea3cc9c232e080e703279ebbf6ce4166cd5a3ef7d /perl-install
parent5b81c7eb49c4756b99d8708849a5bfca00193be8 (diff)
downloaddrakx-416a326f1fc775511cf1eac2c04cca2a69d9961a.tar
drakx-416a326f1fc775511cf1eac2c04cca2a69d9961a.tar.gz
drakx-416a326f1fc775511cf1eac2c04cca2a69d9961a.tar.bz2
drakx-416a326f1fc775511cf1eac2c04cca2a69d9961a.tar.xz
drakx-416a326f1fc775511cf1eac2c04cca2a69d9961a.zip
make_boot_splash is no good since the same initrd is used with or without vga=,
so call add_boot_splash directly
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm9
-rwxr-xr-xperl-install/standalone/bootloader-config2
2 files changed, 1 insertions, 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;
}