summaryrefslogtreecommitdiffstats
path: root/images
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
commitfd8bbba2f02b8bccd69e67c326fd320c0827941d (patch)
treeade69986b2f99e113c95009736399966d4a3d511 /images
parent368f416649ed34557702a946ec8c0cec2fd45294 (diff)
downloaddrakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar
drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar.gz
drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar.bz2
drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar.xz
drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.zip
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 ------------------------------------------------------------------------
Diffstat (limited to 'images')
-rw-r--r--images/Makefile2
-rw-r--r--images/NEWS4
-rw-r--r--images/help.msg.xml2
-rwxr-xr-ximages/make_boot_img26
4 files changed, 19 insertions, 15 deletions
diff --git a/images/Makefile b/images/Makefile
index cfdaa2141..850b7b83b 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.config
-VERSION=1.49
+VERSION=1.50
PRODUCT=drakx-installer-images
KERNELS=$(shell rpm -qf /lib/modules/2.*)
diff --git a/images/NEWS b/images/NEWS
index 83db55501..3e05a6080 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,7 @@
+Version 1.50 - 13 Oct 2010, by Thierry Vignaud
+
+- 2011.0 build
+
Version 1.49 - 27 May 2010, by Olivier Blin
- disable restore option
diff --git a/images/help.msg.xml b/images/help.msg.xml
index e6d715830..358dcf248 100644
--- a/images/help.msg.xml
+++ b/images/help.msg.xml
@@ -1,5 +1,5 @@
<document>
- <green>Welcome to <blue>Mandriva Linux</blue> install help</green>
+ <green>Welcome to <blue>Mageia</blue> install help</green>
In most cases, the best way to get started is to simply press the <yellow>&lt;Enter&gt;</yellow> key.
If you experience problems with standard install, try one of the following
diff --git a/images/make_boot_img b/images/make_boot_img
index 2d70e6483..81b2d6429 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -452,9 +452,9 @@ To Build a Bootable CD-ROM, try:
-f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd($type, $I, "$dir/$type.rdz");
output("$dir/boot.msg", "
-Welcome to Mandriva Linux 7.1
+Welcome to Mageia 1
-Press <Enter> to install or upgrade a system 7mMandriva Linux7m
+Press <Enter> to install or upgrade a system 7mMageia7m
");
output("$dir/silo.conf", qq(
@@ -501,7 +501,7 @@ sub boot_img_ppc {
MacRISC
</COMPATIBLE>
<DESCRIPTION>
-Mandriva Linux PPC bootloader
+Mageia PPC bootloader
</DESCRIPTION>
<BOOT-SCRIPT>
" screen" output
@@ -513,7 +513,7 @@ device-end
3 to foreground-color
0 to background-color
" "(0C)" fb8-write drop
-" Booting Mandriva Linux PPC..." fb8-write drop 100 ms
+" Booting Mageia PPC..." fb8-write drop 100 ms
boot cd:,\boot\yaboot
</BOOT-SCRIPT>
<OS-BADGE-ICONS>
@@ -571,7 +571,7 @@ boot cd:,\boot\yaboot
');
output("images/yaboot.conf", '
-init-message = "\nWelcome to Mandriva Linux PPC!\nHit <TAB> for boot options.\n\n"
+init-message = "\nWelcome to Mageia PPC!\nHit <TAB> for boot options.\n\n"
timeout = 150
device=cd:
default = install-gui
@@ -663,7 +663,7 @@ image = enet:0,vmlinux-power4
');
output("images/yaboot.msg", '
-Thanks for choosing Mandriva Linux PPC. The following is a short
+Thanks for choosing Mageia PPC. The following is a short
explanation of the various options for booting the install CD.
All options ending with "-power4" use the BOOT kernel for ppc 9xx and POWER4.
@@ -700,7 +700,7 @@ sub syslinux_all_files {
@$kernels or die "syslinux_all_files: no kernel\n";
$default_vga =~ /788/ or die 'we rely on vga=788 for bootsplash';
- my $theme = $ENV{THEME} || 'Mandriva-Free';
+ my $theme = $ENV{THEME} || 'Mageia-Free';
each_index {
mkdir "$dir/alt$::i", 0777;
@@ -758,14 +758,14 @@ sub boot_iso {
_ "cp /usr/lib/syslinux/isolinux.bin .boot_iso/isolinux/isolinux.bin";
my $with_gfxboot = 0;
- _ "cp /usr/share/gfxboot/themes/Mandriva/install/* .boot_iso/isolinux" if $with_gfxboot;
+ _ "cp /usr/share/gfxboot/themes/Mageia/install/* .boot_iso/isolinux" if $with_gfxboot;
# _ "cp /home/pixel/cooker/soft/theme/mandriva-gfxboot-theme/inst/* .boot_iso/isolinux" if $with_gfxboot;
#_ "cp /home/teuf/mdv/src/mandriva-gfxboot-theme/inst/* .boot_iso/isolinux" if $with_gfxboot;
_ "cp /usr/lib/syslinux/gfxboot.com .boot_iso/isolinux/gfxboot.com" if $with_gfxboot;
output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot));
- _ "genisoimage -r -f -J -cache-inodes -V 'Mdv Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso";
+ _ "genisoimage -r -f -J -cache-inodes -V 'Mga Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso";
rm_rf('.boot_iso');
}
@@ -787,7 +787,7 @@ timeout 10
default 0
fallback 1
-title Mandriva Linux Install
+title Mageia Install
root (hd0,0)
kernel /cooker/isolinux/alt0/vmlinuz $default_append $default_acpi $default_vga automatic=method:disk
@@ -799,13 +799,13 @@ pause To display the help, press <space> until you reach "HELP END"
pause .
pause Please see http://qa.mandriva.com/hd_grub.cgi for a friendlier solution
pause .
-pause To specify the location where Mandriva Linux is copied,
-pause choose "Mandriva Linux Install", and press "e".
+pause To specify the location where Mageia is copied,
+pause choose "Mageia Install", and press "e".
pause Then change "root (hd0,0)". FYI:
pause - (hd0,0) is the first partition on first bios hard drive (usually hda1)
pause - (hd0,4) is the first extended partition (usually hda5)
pause - (hd1,0) is the first partition on second bios hard drive
-pause Replace /cooker to suits the directory containing Mandriva Linux
+pause Replace /cauldron to suit the directory containing Mageia
pause .
pause HELP END
EOF