diff options
Diffstat (limited to 'perl-install/bootloader.pm')
| -rw-r--r-- | perl-install/bootloader.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 52ecdc89f..e1e107db8 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1,4 +1,4 @@ -package bootloader; # $Id$ +package bootloader; # $Id: bootloader.pm 267511 2010-04-12 12:34:45Z cfergeau $ use diagnostics; use strict; @@ -43,9 +43,9 @@ sub vmlinuz2kernel_str { { basename => $basename, version => $version, - $version =~ /([\d.]*)-(\D.*)-((\d+|0\.rc\d+.*)(mdk|mdv|mnb))$/ ? #- eg: 2.6.22.5-server-1mdv + $version =~ /([\d.]*)-(\D.*)-((\d+|0\.rc\d+.*)mga)$/ ? #- eg: 2.6.22.5-server-1mdv (ext => $2, version_no_ext => "$1-$3") : - $version =~ /(.*md[kv])-?(.*)/ ? #- (old) eg: 2.6.17-13mdventerprise + $version =~ /(.*mga)-?(.*)/ ? #- (old) eg: 2.6.17-13mdventerprise (ext => $2, version_no_ext => $1) : (version_no_ext => $version), }; } @@ -1007,7 +1007,7 @@ sub suggest { { defaultos => "linux", entries => [], - 'init-message' => "Welcome to Mandriva Linux!", + 'init-message' => "Welcome to %s!", delay => 30, #- OpenFirmware delay timeout => 50, enableofboot => 1, @@ -1943,7 +1943,7 @@ sub ensure_pkg_is_installed { if ($main_method eq 'grub' || $main_method eq 'lilo') { $do_pkgs->ensure_binary_is_installed($main_method, $main_method, 1) or return 0; if ($bootloader->{method} eq 'grub-graphic') { - $do_pkgs->ensure_is_installed('mandriva-gfxboot-theme', '/usr/share/gfxboot/themes/Mandriva/boot/message', 1) or return 0; + $do_pkgs->ensure_is_installed('mageia-gfxboot-theme', '/usr/share/gfxboot/themes/Mageia/boot/message', 1) or return 0; } } 1; |