From c01c70b3db92361f6131064f2f48e8cd4794f481 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 28 Jan 2005 13:08:28 +0000
Subject: only prompt for "Additional Drivers floppy" for network

---
 mdk-stage1/Makefile  | 2 +-
 mdk-stage1/modules.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'mdk-stage1')

diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index af4ec2e15..546090b87 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -205,7 +205,7 @@ $(STAGE1OBJS-CDROM): %-CDROM.o: %.c
 	$(DIET) $(COMPILE) $(INCLUDES) $(CDROM_DEFS) -c $< -o $@
 
 $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c
-	$(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -c $< -o $@
+	$(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -DENABLE_ADDITIONAL_MODULES -c $< -o $@
 
 $(STAGE1OBJS-FULL): %-FULL.o: %.c
 	$(DIET) $(COMPILE) $(INCLUDES) $(USB_DEFS_GEN) $(PCMCIA_DEFS) -DENABLE_BOOTSPLASH -c $< -o $@
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index cd8e981d3..3ba947e1f 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -88,6 +88,7 @@ static void *grab_file(const char *filename, unsigned long *size)
 
 static enum return_type ensure_additional_modules_available(void)
 {
+#ifdef ENABLE_ADDITIONAL_MODULES
         struct stat statbuf;
         if (stat(additional_archive_name, &statbuf)) {
                 char floppy_mount_location[] = "/tmp/floppy";
@@ -139,6 +140,10 @@ static enum return_type ensure_additional_modules_available(void)
                 return ret;
         } else
                 return RETURN_OK;
+#else
+	allow_additional_modules_floppy = 0;
+	return RETURN_ERROR;
+#endif
 }
 
 int insmod_local_file(char * path, char * options)
-- 
cgit v1.2.1