Synthesized commit during git-svn import combining previous Mandriva history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line

Add drakx structure on the SVN
------------------------------------------------------------------------
r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned advertising
------------------------------------------------------------------------
r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line

Import Clean perl-install
------------------------------------------------------------------------
r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line

Add cleaned files
------------------------------------------------------------------------
r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned kernel
------------------------------------------------------------------------
r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned tools
------------------------------------------------------------------------
r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line

Import stage1
------------------------------------------------------------------------
r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line

Import images
------------------------------------------------------------------------
r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines

readd missing file

------------------------------------------------------------------------
r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line

Import rescue
------------------------------------------------------------------------
r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines

import cleaned rescue for Mageia

------------------------------------------------------------------------
r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line

import (cleaned) doc
------------------------------------------------------------------------

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;