use a #define for Linux-Mandrake following fclara's require

9 files changed, 23 insertions, 19 deletions

diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index d4a3f2798..26e12c860 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -28,7 +28,7 @@ ARCH := $(patsubst sparc%,sparc,$(ARCH))
 
 CFLAGS = -Os -Wall -Werror -fomit-frame-pointer
 INCLUDES = -I.
-DEFS = -D_GNU_SOURCE=1 -DVERSION=\"$(VERSION)\"
+DEFS = -DVERSION=\"$(VERSION)\"
 
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS)
 
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c
index 2188ddcc7..99fd4b7d1 100644
--- a/mdk-stage1/cdrom.c
+++ b/mdk-stage1/cdrom.c
@@ -54,13 +54,13 @@ static enum return_type try_with_device(char *dev_name)
 	if (access("/tmp/image/Mandrake/mdkinst", R_OK)) {
 		enum return_type results;
 		umount("/tmp/image");
-		results = ask_yes_no("That CDROM disc does not seem to be a Linux-Mandrake Installation CDROM.\nRetry with another disc?");
+		results = ask_yes_no("That CDROM disc does not seem to be a " DISTRIB_NAME " Installation CDROM.\nRetry with another disc?");
 		if (results == RETURN_OK)
 			return try_with_device(dev_name);
 		return results;
 	}
 
-	log_message("found a Linux-Mandrake CDROM, good news!");
+	log_message("found a " DISTRIB_NAME " CDROM, good news!");
 
 	if (IS_SPECIAL_STAGE2 || ramdisk_possible())
 		load_ramdisk(); /* we don't care about return code, we'll do it live if we failed */
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index d54b80ff1..ca8755fd3 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -15,9 +15,14 @@
 #ifndef _CONFIG_STAGE1_H_
 #define _CONFIG_STAGE1_H_
 
+#define _GNU_SOURCE 1
+
+
 /* If we have more than that amount of memory, we assume we can load the second stage as a ramdisk */
 #define MEM_LIMIT_RAMDISK 52 * 1024
 
+#define DISTRIB_NAME "Linux-Mandrake"
+
 /* user-definable (in Makefile): DISABLE_NETWORK, DISABLE_DISK, DISABLE_CDROM, DISABLE_PCMCIA */
 
 
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index 42943e324..05501f2d3 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -84,7 +84,7 @@ static enum return_type try_with_device(char *dev_name)
 		return try_with_device(dev_name);
 	}
 
-	results = ask_from_entries("Please enter the directory containing the Linux-Mandrake installation.",
+	results = ask_from_entries("Please enter the directory containing the " DISTRIB_NAME " Installation.",
 				   questions_location, &answers_location, 24);
 	if (results != RETURN_OK) {
 		umount("/tmp/disk");
@@ -106,11 +106,11 @@ static enum return_type try_with_device(char *dev_name)
 	if (access("/tmp/image/Mandrake/mdkinst", R_OK)) {
 		umount("/tmp/disk");
 		unlink("/tmp/image");
-		error_message("I can't find the Linux-Mandrake installation in the specified directory.");
+		error_message("I can't find the " DISTRIB_NAME " Installation in the specified directory.");
 		return try_with_device(dev_name);
 	}
 
-	log_message("found the Linux-Mandrake Installation, good news!");
+	log_message("found the " DISTRIB_NAME " Installation, good news!");
 
 	if (IS_SPECIAL_STAGE2) {
 		if (load_ramdisk() != RETURN_OK) {
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
index 22a381e6e..bbdc4e0b8 100644
--- a/mdk-stage1/init.c
+++ b/mdk-stage1/init.c
@@ -20,7 +20,7 @@
  */
 
 #include "minilibc.h"
-
+#include "config-stage1.h"
 
 #define KICK_FLOPPY     1
 #define KICK_BOOTP	2
@@ -354,7 +354,7 @@ void disable_swap(void)
 		*chptr = '\0';
 
 		/* call swapoff */
-		printf("Swapoff %s ", start);
+		printf("swapoff %s", start);
 		if (swapoff(start))
 			printf(" failed (%d)\n", errno);
 		else
@@ -396,7 +396,7 @@ int main(int argc, char **argv)
 		printf("*** TESTING MODE ***\n");
 
 
-	printf("\n--- Hi. Linux-Mandrake install initializer starting. ---\n");
+	printf("\n--- Hi. " DISTRIB_NAME " install initializer starting. ---\n");
 	printf("VERSION: %s\n", VERSION);
 
 	
@@ -483,9 +483,8 @@ int main(int argc, char **argv)
 		kill(klog_pid, 9);
 		printf("exiting stage1-initializer -- giving hand to rescue\n");
 		return 0;
-        }
-	
-	printf("back to stage1-initializer control -- install exited normally\n");
+        } else
+		printf("back to stage1-initializer control -- install exited normally\n");
 
 	if (testing)
 		return 0;
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index 12df7f136..2e0870a43 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -513,7 +513,7 @@ static enum return_type intf_select_and_up(void)
 
 enum return_type nfs_prepare(void)
 {
-	char * questions[] = { "NFS server name", "Linux-Mandrake directory", NULL };
+	char * questions[] = { "NFS server name", DISTRIB_NAME " directory", NULL };
 	char * questions_auto[] = { "server", "directory", NULL };
 	char ** answers;
 	char * nfsmount_location;
@@ -524,7 +524,7 @@ enum return_type nfs_prepare(void)
 
 	do {
 		results = ask_from_entries_auto("Please enter the name or IP address of your NFS server, "
-						"and the directory containing the Linux-Mandrake installation.",
+						"and the directory containing the " DISTRIB_NAME " installation.",
 						questions, &answers, 40, questions_auto);
 		if (results != RETURN_OK)
 			return nfs_prepare();
@@ -541,14 +541,14 @@ enum return_type nfs_prepare(void)
 		}
 
 		if (access("/tmp/image/Mandrake/mdkinst", R_OK)) {
-			error_message("That NFS volume does not seem to contain the Linux-Mandrake Installation.");
+			error_message("That NFS volume does not seem to contain the " DISTRIB_NAME " Installation.");
 			umount("/tmp/image");
 			results = RETURN_BACK;
 		}
 	}
 	while (results == RETURN_BACK);
 
-	log_message("found the Linux-Mandrake Installation, good news!");
+	log_message("found the " DISTRIB_NAME " Installation, good news!");
 
 	if (IS_SPECIAL_STAGE2) {
 		if (load_ramdisk() != RETURN_OK) {
diff --git a/mdk-stage1/newt-frontend.c b/mdk-stage1/newt-frontend.c
index f0a373357..e30a5a5c7 100644
--- a/mdk-stage1/newt-frontend.c
+++ b/mdk-stage1/newt-frontend.c
@@ -42,7 +42,7 @@ void init_frontend(void)
 	newtInit();
 	newtCls();
 	
-	newtDrawRootText(0, 0, "Welcome to Linux-Mandrake (" VERSION ") " __DATE__ " " __TIME__);
+	newtDrawRootText(0, 0, "Welcome to " DISTRIB_NAME " (" VERSION ") " __DATE__ " " __TIME__);
 	
 	newtPushHelpLine(" <Alt-F1> for here, <Alt-F3> to see the logs, <Alt-F4> for kernel msg");
 }
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 93aae9338..59e63b988 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -187,7 +187,7 @@ int main(int argc, char **argv)
 		set_param(MODE_TESTING);
 
 	open_log();
-	log_message("welcome to the Linux-Mandrake install (stage1, version " VERSION " built " __DATE__ " " __TIME__")");
+	log_message("welcome to the " DISTRIB_NAME " install (stage1, version " VERSION " built " __DATE__ " " __TIME__")");
 	process_cmdline();
 	spawn_shell();
 	if (load_modules_dependencies())
diff --git a/mdk-stage1/stdio-frontend.c b/mdk-stage1/stdio-frontend.c
index 0c435e186..4b0b6bd0d 100644
--- a/mdk-stage1/stdio-frontend.c
+++ b/mdk-stage1/stdio-frontend.c
@@ -33,7 +33,7 @@
 
 void init_frontend(void)
 {
-	printf("Welcome to Linux-Mandrake (" VERSION ") " __DATE__ " " __TIME__ "\n");
+	printf("Welcome to " DISTRIB_NAME " (" VERSION ") " __DATE__ " " __TIME__ "\n");
 }