diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-09-13 12:39:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-09-13 12:39:54 +0000 |
| commit | 08c07432669cd3f211bf709265dc9bbd0e84751e (patch) | |
| tree | 707593d10e1a84ad1c2abb9d2ec33a6f499ead78 /perl-install/bootloader.pm | |
| parent | d652be82821b4733b3a4533cec8acd6d68c33d34 (diff) | |
| download | drakx-backup-do-not-use-08c07432669cd3f211bf709265dc9bbd0e84751e.tar drakx-backup-do-not-use-08c07432669cd3f211bf709265dc9bbd0e84751e.tar.gz drakx-backup-do-not-use-08c07432669cd3f211bf709265dc9bbd0e84751e.tar.bz2 drakx-backup-do-not-use-08c07432669cd3f211bf709265dc9bbd0e84751e.tar.xz drakx-backup-do-not-use-08c07432669cd3f211bf709265dc9bbd0e84751e.zip | |
- drop splashimage if file can't be found (useful when upgrading)
- internally splashimage is preferably a file, not a grub file
Diffstat (limited to 'perl-install/bootloader.pm')
| -rw-r--r-- | perl-install/bootloader.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 99eb167b2..4f431697a 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -271,6 +271,11 @@ sub read_grub_menu_lst { } $b{method} = $b{splashimage} ? 'grub-graphic' : 'grub-menu'; + if ($b{splashimage} =~ m!^/boot! && ! -e "$::prefix$b{splashimage}") { + log::l("dropping bootloader splashimage since $b{splashimage} doesn't exist"); + delete $b{splashimage}; + } + \%b; } @@ -1349,7 +1354,7 @@ sub write_grub { $bootloader->{serial} ||= "--unit=$1 --speed=$2"; $bootloader->{terminal} ||= "--timeout=" . ($bootloader->{timeout} || 0) . " console serial"; } elsif ($bootloader->{splashimage} eq '' && $bootloader->{method} eq 'grub-graphic') { - $bootloader->{splashimage} ||= $file2grub->("/boot/grub/mdv-grub_splash.xpm.gz"); + $bootloader->{splashimage} ||= '/boot/grub/mdv-grub_splash.xpm.gz'; $bootloader->{viewport} ||= "3 2 77 22"; $bootloader->{shade} ||= "1"; } elsif ($bootloader->{method} eq 'grub-menu') { |