10 files changed, 27 insertions, 13 deletions
diff --git a/bootdisk/i386/boot.msg b/bootdisk/i386/boot.msg
index ed83cbb96..e7029164b 100644
--- a/bootdisk/i386/boot.msg
+++ b/bootdisk/i386/boot.msg
@@ -1,5 +1,5 @@
  
-                09Welcome to 0cRed Hat09 Linux 7.1!07
+                09Welcome to 0cRed Hat09 Linux @VERSION@!07
 
  -  To install or upgrade 0cRed Hat07 Linux in graphical mode, 
     press the 0f<ENTER>07 key.
diff --git a/bootdisk/i386/de_DE/boot.msg b/bootdisk/i386/de_DE/boot.msg
index 7a155cd17..8c2769116 100644
--- a/bootdisk/i386/de_DE/boot.msg
+++ b/bootdisk/i386/de_DE/boot.msg
@@ -1,6 +1,6 @@
 
  
-              09Willkommen bei 0cRed Hat09 Linux 7.1!07
+              09Willkommen bei 0cRed Hat09 Linux @VERSION@!07
 
  o  Um eine grafische Installation oder Aktualisierung auf einem System
     vorzunehmen, auf dem 0cRed Hat07 Linux 3.0.3 oder sp„ter ausgefhrt
diff --git a/bootdisk/i386/es_ES/boot.msg b/bootdisk/i386/es_ES/boot.msg
index 5ca4547fd..4fedea3bd 100644
--- a/bootdisk/i386/es_ES/boot.msg
+++ b/bootdisk/i386/es_ES/boot.msg
@@ -1,6 +1,6 @@
 
  
-                09Bienvenido a 0cRed Hat09 Linux 7.107
+                09Bienvenido a 0cRed Hat09 Linux @VERSION@07
 
  o  Para instalar o actualizar un sistema que funcione con 0cRed Hat07
     Linux 3.0.3 o con una versi¢n posterior en modo gr fico (graphic), pulse:
diff --git a/bootdisk/i386/fr_FR/boot.msg b/bootdisk/i386/fr_FR/boot.msg
index e480155b9..5a7d88ddb 100644
--- a/bootdisk/i386/fr_FR/boot.msg
+++ b/bootdisk/i386/fr_FR/boot.msg
@@ -1,6 +1,6 @@
 
 
-            090cRed Hat09 Linux 7.1 vous souhaite la bienvenue !07
+            090cRed Hat09 Linux @VERSION@ vous souhaite la bienvenue !07
 
 o  Pour une nouvelle installation, ou pour mettre … jour un systŠme 0cRed Hat07
    Linux 3.0.3 ou sup‚rieur en mode graphique, tapez 0f<Entr‚e>07.
diff --git a/bootdisk/i386/it_IT/boot.msg b/bootdisk/i386/it_IT/boot.msg
index b2b39a310..f1991dab3 100644
--- a/bootdisk/i386/it_IT/boot.msg
+++ b/bootdisk/i386/it_IT/boot.msg
@@ -1,6 +1,6 @@
 
 
-                 09Welcome to 0cRed Hat09 Linux 7.1!07
+                 09Welcome to 0cRed Hat09 Linux @VERSION@!07
 
  o  Per installare o aggiornare un sistema con 0cRed Hat07 Linux 3.0.3
     o piu' recente in modalita' grafica, premete il tasto 0f<ENTER>07.
diff --git a/bootdisk/i386/ja_JP/boot.msg b/bootdisk/i386/ja_JP/boot.msg
index ed83cbb96..e7029164b 100644
--- a/bootdisk/i386/ja_JP/boot.msg
+++ b/bootdisk/i386/ja_JP/boot.msg
@@ -1,5 +1,5 @@
  
-                09Welcome to 0cRed Hat09 Linux 7.1!07
+                09Welcome to 0cRed Hat09 Linux @VERSION@!07
 
  -  To install or upgrade 0cRed Hat07 Linux in graphical mode, 
     press the 0f<ENTER>07 key.
diff --git a/bootdisk/i386/sv_SE/boot.msg b/bootdisk/i386/sv_SE/boot.msg
index 36891a586..72e134148 100755
--- a/bootdisk/i386/sv_SE/boot.msg
+++ b/bootdisk/i386/sv_SE/boot.msg
@@ -1,5 +1,5 @@
 
-                    09Vaelkommen till 0cRed Hat09 Linux 7.1!07
+                    09Vaelkommen till 0cRed Hat09 Linux @VERSION@!07
 
  -  Foer att installera eller uppgradera 0cRed Hat07 Linux i grafiskt laege trycker
     du 0f<ENTER>07-tangenten.
diff --git a/scripts/buildinstall b/scripts/buildinstall
index bfddc3f2c..e36d980e0 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 usage() {
-	echo "Usage: buildinstall [--comp <component>] [--pkgorder <file>] <root>" >&2
+	echo "Usage: buildinstall [--comp <component>] [--pkgorder <file>] [--version <version>] <root>" >&2
 	exit 1
 }
 
@@ -17,6 +17,10 @@ while [ $# -gt 0 ]; do
 	    COMPNAME=$2
 	    shift; shift
 	    ;;
+	--version)
+	    VERSION=$2
+	    shift; shift
+	    ;;
 	*)
 	    if [ -n "$DIR" -o ! -d $1/RedHat/RPMS ]; then
 		usage
@@ -27,6 +31,10 @@ while [ $# -gt 0 ]; do
     esac
 done
 
+if [ -z "$VERSION" ]; then
+    VERSION=7.1
+fi
+
 if [ -z "$DIR" ]; then
     usage
 fi
@@ -82,9 +90,9 @@ if [ -n "$PKGORDER" -a -x $p/RedHat/instimage/usr/lib/anaconda-runtime/pkgorder
 fi
 
 if [ -x /usr/bin/runroot ]; then
-    runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/RedHat/RPMS $p $p/image-template $BUILDARCH"
+    runroot $COMPNAME --onlyone --arch $BUILDARCH "cd $BUILDINSTDIR\; ./mk-images $p/RedHat/RPMS $p $p/image-template $BUILDARCH $VERSION"
 else
-    $MK_IMAGES $p/RedHat/RPMS $p $p/image-template $BUILDARCH
+    $MK_IMAGES $p/RedHat/RPMS $p $p/image-template $BUILDARCH $VERSION
 fi
 
 rm -rf $BUILDINSTDIR
diff --git a/scripts/mk-images b/scripts/mk-images
index 71466c98b..0aa8b6cf9 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -3,7 +3,7 @@
 PATH=$PATH:/sbin:/usr/sbin
 
 usage () {
-	echo "usage: mk-images <pkgsrc> <toplevel> <template> <buildarch>"
+	echo "usage: mk-images <pkgsrc> <toplevel> <template> <buildarch> <version>"
     exit 0
 }
 
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 8501289a0..4b7de2a5f 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -25,7 +25,10 @@ prepareBootImage() {
 		sed -e "s/initrd.img/initrd.img lang=$BOOTDIR/g" < $MBD_BOOTTREE/syslinux.cfg > $MBD_BOOTTREE/syslinux.cf2
 		mv -f $MBD_BOOTTREE/syslinux.cf2 $MBD_BOOTTREE/syslinux.cfg
 	    fi
-	    cp $BOOTDISKDIR/$BOOTLANG/*.msg $MBD_BOOTTREE
+	    for file in $BOOTDISKDIR/$BOOTLANG/*.msg; do
+		filename=`basename $file`
+		sed -s "s/@VERSION@/$VERSION/g" $file > $MBD_BOOTTREE/$filename
+	    done
 	    if [ $? != 0 ]; then
 		echo $0: Failed to copy messages from $BOOTDISKDIR/$BOOTLANG to $MBD_BOOTTREE.
 		umount $MBD_BOOTTREE
@@ -33,7 +36,10 @@ prepareBootImage() {
 		exit 1
 	    fi
 	else
-	    cp $BOOTDISKDIR/*.msg $MBD_BOOTTREE
+	    for file in $BOOTDISKDIR/*.msg; do
+		filename=`basename $file`
+		sed -s "s/@VERSION@/$VERSION/g" $file > $MBD_BOOTTREE/$filename
+	    done
 	    if [ $? != 0 ]; then
 		echo $0: Failed to copy messages from $BOOTDISKDIR to $MBD_BOOTTREE.
 		umount $MBD_BOOTTREE