factorize the distrib version

7 files changed, 13 insertions, 16 deletions

diff --git a/Makefile.config b/Makefile.config
index 793fd669e..57645d237 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -9,7 +9,9 @@ STAGE2_LIVE = $(STAGE2_DEST)/live
 MAIN_RPMS_DIR = $(ROOTDEST)/media/main
 MEDIA_INFO_DEST = $(ROOTDEST)/media/media_info
 
-
+DISTRIB_NAME = Mandrakelinux
+DISTRIB_VERSION = 10.2
+DISTRIB_DESCR = "$(DISTRIB_NAME) release $(DISTRIB_VERSION) (Cooker)"
 
 
 # not config, but useful everywhere :)
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index d20aecf71..ae1713aa0 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -40,14 +40,12 @@
  #*****************************************************************************
 
 
-VERSION = 10.1
-
 top_dir = .
 
 include $(top_dir)/Makefile.common
 
 
-DEFS = -DVERSION=\"$(VERSION)\" -DSPAWN_SHELL $(ADDITIONAL_DEFS) -D_FILE_OFFSET_BITS=64
+DEFS = -DDISTRIB_NAME=\"$(DISTRIB_NAME)\" -DDISTRIB_VERSION=\"$(DISTRIB_VERSION)\" -DDISTRIB_DESCR=\"$(DISTRIB_DESCR)\" -DSPAWN_SHELL $(ADDITIONAL_DEFS) -D_FILE_OFFSET_BITS=64
 
 COMPILE = $(CC) $(DEFS) $(CFLAGS)
 
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index 662ad4fb5..3dbbf53b8 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -34,7 +34,11 @@
 #ifdef MANDRAKE_MOVE
 
 #define MEM_LIMIT_MOVE 120
+
+#undef DISTRIB_NAME
 #define DISTRIB_NAME "Mandrakemove"
+#undef DISTRIB_DESCR
+#define DISTRIB_DESCR DISTRIB_NAME
 
 #define IMAGE_LOCATION_DIR SLASH_LOCATION "/"
 #define IMAGE_LOCATION_REL "cdrom"
@@ -51,8 +55,6 @@
 
 #else
 
-#define DISTRIB_NAME "Mandrakelinux"
-
 #define LIVE_LOCATION_REL "install/stage2/live/"
 #define CLP_LOCATION_REL  "install/stage2/"
 #define CLP_STAGE2_NAME "mdkinst.clp"
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index d22fc7cd1..820c42273 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -604,19 +604,13 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
 	spawn_interactive();
 
 	open_log();
-	log_message("welcome to the " DISTRIB_NAME " install (mdk-stage1, version " VERSION " built " __DATE__ " " __TIME__")");
+	log_message("welcome to the " DISTRIB_NAME " install (mdk-stage1, version " DISTRIB_VERSION " built " __DATE__ " " __TIME__")");
 	process_cmdline();
 #ifdef SPAWN_SHELL
 	spawn_shell();
 #endif
 	init_modules_insmoding();
-	init_frontend("Welcome to " DISTRIB_NAME
-#ifdef MANDRAKE_MOVE
-                      ", "
-#else
-                      " (" VERSION ") "
-#endif
-                      __DATE__ " " __TIME__);
+	init_frontend("Welcome to " DISTRIB_DESCR ", " __DATE__ " " __TIME__);
 
 	if (IS_EXPERT)
 		expert_third_party_modules();
diff --git a/rescue/Makefile b/rescue/Makefile
index c08d21c75..bbcf73e5b 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -6,7 +6,7 @@ install: rescue.clp
 	cp -f $< $(STAGE2_DEST)
 
 rescue.clp: list list.$(ARCH) drvinst guessmounts lsparts rescue-doc make_rescue_img
-	./make_rescue_img
+	DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img
 
 clean: 
 	rm -f rescue.clp kernel_read_part
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index a3a946a12..d1d96afeb 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -56,6 +56,7 @@ foreach (cat_("dirs")) {
 _ "cp -a tree/* $tmp";
 _ "find $tmp -name 'CVS*' | xargs rm -rf";
 _ "perl devices.pl $tmp/dev";
+substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue";
 
 install_raw(keyboard::loadkeys_files());
 my %keytable_conflicts;
diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue
index 7dba2360b..93f718d51 100644
--- a/rescue/tree/etc/issue
+++ b/rescue/tree/etc/issue
@@ -18,7 +18,7 @@
                       
 
 
-Mandrakelinux release 10.2
+DISTRIB_DESCR
 
 Use loadkeys to change your keyboard layout (eg: loadkeys fr)
 Use modprobe to load modules (eg: modprobe snd-card-fm801)