diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-01-28 13:08:28 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-01-28 13:08:28 +0000 |
| commit | c01c70b3db92361f6131064f2f48e8cd4794f481 (patch) | |
| tree | e2df359a0c5736e7a259b68077934af4786aac45 | |
| parent | b4265b033c207c7af9fa4e2397322ed2c826eb1d (diff) | |
| download | drakx-c01c70b3db92361f6131064f2f48e8cd4794f481.tar drakx-c01c70b3db92361f6131064f2f48e8cd4794f481.tar.gz drakx-c01c70b3db92361f6131064f2f48e8cd4794f481.tar.bz2 drakx-c01c70b3db92361f6131064f2f48e8cd4794f481.tar.xz drakx-c01c70b3db92361f6131064f2f48e8cd4794f481.zip | |
only prompt for "Additional Drivers floppy" for network
| -rw-r--r-- | mdk-stage1/Makefile | 2 | ||||
| -rw-r--r-- | mdk-stage1/modules.c | 5 |
2 files changed, 6 insertions, 1 deletions
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) |