summaryrefslogtreecommitdiffstats
path: root/rescue/install_bootloader
diff options
context:
space:
mode:
authorMageia SVN-Git Migration <svn-git-migration@mageia.org>2011-02-06 22:37:08 +0000
committerMageia SVN-Git Migration <svn-git-migration@mageia.org>2011-02-06 22:37:08 +0000
commitd9cc095760861d869d2e2ccf05f94454dad32f00 (patch)
treeade69986b2f99e113c95009736399966d4a3d511 /rescue/install_bootloader
parent368f416649ed34557702a946ec8c0cec2fd45294 (diff)
downloaddrakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.tar
drakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.tar.gz
drakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.tar.bz2
drakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.tar.xz
drakx-backup-do-not-use-d9cc095760861d869d2e2ccf05f94454dad32f00.zip
Synthesized commit during git-svn import combining previous Mandriva history with Magiea.
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 ------------------------------------------------------------------------
Diffstat (limited to 'rescue/install_bootloader')
-rwxr-xr-xrescue/install_bootloader4
1 files changed, 2 insertions, 2 deletions
diff --git a/rescue/install_bootloader b/rescue/install_bootloader
index e8bc04ad8..fa7b92543 100755
--- a/rescue/install_bootloader
+++ b/rescue/install_bootloader
@@ -30,7 +30,7 @@ my $release = common::mandrake_release($::prefix) ||
};
if ($release) {
- $release =~ /Mandrake|Mandriva/ or die "release file doesn't contain 'Mandriva', exiting.\n";
+ $release =~ /Mageia|Mandriva/ or die "release file doesn't contain '%s', exiting.\n";
} elsif (fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ])) {
die "unknown distribution mounted in $::prefix\n";
} else {
@@ -59,7 +59,7 @@ if (@main_methods == 0) {
my $install = $bootloader::{'install_raw_' . $main_method} or die "unknown bootloader method install_raw_$main_method\n";
-print "About to re-install Boot Loader $main_method of following Mandriva Linux distribution:\n\t",
+print "About to re-install Boot Loader $main_method of following %s distribution:\n\t",
$release, "\n";
if (!$auto) {
print "=> ok? <press Enter to continue, 'n' and Enter to cancel> ";