Put version in boot.msg

diff --git a/rescue/autoconf/configure.in b/rescue/autoconf/configure.in
index 37fb26f47a8aa9eb5b33c0be6e00d1ee76d00c3e..240287796447863ddb71acdb9fc4ed74c6976dfa 100644 (file)
--- a/rescue/autoconf/configure.in
+++ b/rescue/autoconf/configure.in
@@ -257,6 +257,7 @@ AC_OUTPUT([    \
           linux/floppy/Makefile \
           linux/cdrom/Makefile \
           linux/cdrom/bacula/Makefile \
+          linux/cdrom/cdtree/boot/isolinux/boot.msg \
           freebsd/Makefile \
           solaris/Makefile \
           $PFILES ],  

diff --git a/rescue/configure b/rescue/configure
index f345297ec70af5b6ef8cf2213c36b540dd85ae8d..2b35ded0a1bb9153b50658de57521fbdde033e7b 100755 (executable)
--- a/rescue/configure
+++ b/rescue/configure
@@ -2437,7 +2437,7 @@ MCOMMON=./autoconf/Make.common
 
 
 
-                                                                                          ac_config_files="$ac_config_files autoconf/Make.common Makefile linux/Makefile linux/floppy/Makefile linux/cdrom/Makefile linux/cdrom/bacula/Makefile freebsd/Makefile solaris/Makefile $PFILES"
+                                                                                                    ac_config_files="$ac_config_files autoconf/Make.common Makefile linux/Makefile linux/floppy/Makefile linux/cdrom/Makefile linux/cdrom/bacula/Makefile linux/cdrom/cdtree/boot/isolinux/boot.msg freebsd/Makefile solaris/Makefile $PFILES"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2999,6 +2999,7 @@ do
   "linux/floppy/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/floppy/Makefile" ;;
   "linux/cdrom/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/cdrom/Makefile" ;;
   "linux/cdrom/bacula/Makefile" ) CONFIG_FILES="$CONFIG_FILES linux/cdrom/bacula/Makefile" ;;
+  "linux/cdrom/cdtree/boot/isolinux/boot.msg" ) CONFIG_FILES="$CONFIG_FILES linux/cdrom/cdtree/boot/isolinux/boot.msg" ;;
   "freebsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES freebsd/Makefile" ;;
   "solaris/Makefile" ) CONFIG_FILES="$CONFIG_FILES solaris/Makefile" ;;
   "$PFILES" ) CONFIG_FILES="$CONFIG_FILES $PFILES" ;;

diff --git a/rescue/linux/cdrom/cdtree/boot/isolinux/.cvsignore b/rescue/linux/cdrom/cdtree/boot/isolinux/.cvsignore
index 59b0c3861cff372f30ad5f8fc03738028d31790b..ad63d907b40fa2ac65a45667b1f2b817275fab79 100644 (file)
--- a/rescue/linux/cdrom/cdtree/boot/isolinux/.cvsignore
+++ b/rescue/linux/cdrom/cdtree/boot/isolinux/.cvsignore
@@ -1,3 +1,4 @@
+boot.msg
 map
 initrd.img
 isolinux.cfg

diff --git a/rescue/linux/cdrom/cdtree/boot/isolinux/boot.msg b/rescue/linux/cdrom/cdtree/boot/isolinux/boot.msg
deleted file mode 100644 (file)
index 053abee..0000000
--- a/rescue/linux/cdrom/cdtree/boot/isolinux/boot.msg
+++ /dev/null
@@ -1,14 +0,0 @@
-\f
- 
-         \ f09Welcome to the Bacula Rescue Disk 1.6.0\ f07
-
-To proceed, press the <ENTER> key or type one of the following:
- 
-       linux 1           => shell
-       linux 2           => login  (default if ENTER pressed)
-       linux debug       => print debug during boot then login
-
-       memtest86         => run memtest86 program
-
- 
-\ f02[F1-Main] [F2-Options] [F3-General] [F4-Kernel]\ f07

diff --git a/rescue/linux/cdrom/cdtree/boot/isolinux/boot.msg.in b/rescue/linux/cdrom/cdtree/boot/isolinux/boot.msg.in
new file mode 100644 (file)
index 0000000..12349ed
--- /dev/null
+++ b/rescue/linux/cdrom/cdtree/boot/isolinux/boot.msg.in
@@ -0,0 +1,14 @@
+\f
+ 
+         \ f09Welcome to the Bacula Rescue Disk @VERSION@\ f07
+
+To proceed, press the <ENTER> key or type one of the following:
+ 
+       linux 1           => shell
+       linux 2           => login  (default if ENTER pressed)
+       linux debug       => print debug during boot then login
+
+       memtest86         => run memtest86 program
+
+ 
+\ f02[F1-Main] [F2-Options] [F3-General] [F4-Kernel]\ f07

diff --git a/rescue/version.h b/rescue/version.h
index 367c6afcd6e9bc1d2988c2ce3090bf2ec42dac00..f0ca748b2b753ad620e8c79fe49f984e62157fbf 100644 (file)
--- a/rescue/version.h
+++ b/rescue/version.h
@@ -1,6 +1,5 @@
 /* */
 #undef  VERSION
-#define VERSION "1.0.6"
+#define VERSION "1.7.0"
 #define BDATE   "19 May 2005"
 #define LSMDATE "19May05"
-