summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-06-02 12:23:20 +0000
committerThierry Vignaud <tv@mageia.org>2012-06-02 12:23:20 +0000
commit08bce9593c7388ca37c673a59561fe7bfc64d5d3 (patch)
treed2d44e0bbb401ac7ff60ec752221d7f141fb8bad
parent326f1281b14f6cb558fd9a8203a79867356a15b9 (diff)
downloaddrakx-08bce9593c7388ca37c673a59561fe7bfc64d5d3.tar
drakx-08bce9593c7388ca37c673a59561fe7bfc64d5d3.tar.gz
drakx-08bce9593c7388ca37c673a59561fe7bfc64d5d3.tar.bz2
drakx-08bce9593c7388ca37c673a59561fe7bfc64d5d3.tar.xz
drakx-08bce9593c7388ca37c673a59561fe7bfc64d5d3.zip
(boot_img_sparc) fix version in "Welcome to Mageia" message
-rw-r--r--images/Makefile2
-rwxr-xr-ximages/make_boot_img2
2 files changed, 2 insertions, 2 deletions
diff --git a/images/Makefile b/images/Makefile
index 4b06206e4..a39fb7743 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -9,7 +9,7 @@ IMAGES_DEST = $(ROOTDEST)/install/images
all: images
images: all.kernels
- DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_boot_img
+ DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img
rm -rf images/alternatives
if [ `ls images/*.img-* 2>/dev/null | wc -l` -gt 0 ]; then \
mkdir images/alternatives; cd images/alternatives; mv ../*.img-* .; md5sum *.img-* > MD5SUM; \
diff --git a/images/make_boot_img b/images/make_boot_img
index 33096a429..a2a93f47c 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -463,7 +463,7 @@ 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 Mageia 1
+Welcome to Mageia $ENV{DISTRIB_VERSION}
Press <Enter> to install or upgrade a system 7mMageia7m
");