summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-06-06 12:21:51 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-06-06 12:21:51 +0000
commit0a7d04ff4bfbb562304038a9d87668f455d1b963 (patch)
tree10a9f58a66a811cf35acc354c8d2c5baa206c613 /mdk-stage1
parent34d8b1c22cc0d288796027ff2412c3268b2d4f8f (diff)
downloaddrakx-0a7d04ff4bfbb562304038a9d87668f455d1b963.tar
drakx-0a7d04ff4bfbb562304038a9d87668f455d1b963.tar.gz
drakx-0a7d04ff4bfbb562304038a9d87668f455d1b963.tar.bz2
drakx-0a7d04ff4bfbb562304038a9d87668f455d1b963.tar.xz
drakx-0a7d04ff4bfbb562304038a9d87668f455d1b963.zip
use a wait_message again when in automatic mode for insmoding scsi modules since it's long
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/probing.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index 5b366ca7b..dc8340ea8 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -163,8 +163,18 @@ static void probe_that_type(enum driver_type type)
log_message("PCI: device %04x %04x is \"%s\" (%s)", vendor, device, pcidb[i].name, pcidb[i].module);
#ifndef DISABLE_MEDIAS
if (type == SCSI_ADAPTERS) {
- stg1_info_message("About to load driver for SCSI adapter:\n \n%s", pcidb[i].name);
- warning_insmod_failed(my_insmod(pcidb[i].module, SCSI_ADAPTERS, NULL));
+ int wait_msg = 0;
+ enum insmod_return failed;
+ if (IS_AUTOMATIC) {
+ wait_message("Loading driver for SCSI adapter:\n \n%s", pcidb[i].name);
+ wait_msg = 1;
+ } else
+ stg1_info_message("About to load driver for SCSI adapter:\n \n%s", pcidb[i].name);
+ failed = my_insmod(pcidb[i].module, SCSI_ADAPTERS, NULL);
+ if (wait_msg)
+ remove_wait_message();
+ warning_insmod_failed(failed);
+
}
#endif
#ifndef DISABLE_NETWORK