summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-03-01 18:10:37 +0000
committerOlivier Blin <oblin@mandriva.org>2005-03-01 18:10:37 +0000
commitef5258c7539d248161e737083c73a91924053505 (patch)
tree73bf22b870485480653751534f3710dd55ded873
parentea410c38e49f1d8bc61cf55fbb3a462af2fdddb4 (diff)
downloaddrakx-ef5258c7539d248161e737083c73a91924053505.tar
drakx-ef5258c7539d248161e737083c73a91924053505.tar.gz
drakx-ef5258c7539d248161e737083c73a91924053505.tar.bz2
drakx-ef5258c7539d248161e737083c73a91924053505.tar.xz
drakx-ef5258c7539d248161e737083c73a91924053505.zip
do not show a dialog box before loading network or SCSI drivers, we'll
load it anyway ...
-rw-r--r--mdk-stage1/probing.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index 7c67fdfb9..faf78b612 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -130,22 +130,18 @@ void discovered_device(enum driver_type type,
if (type == SCSI_ADAPTERS) {
int wait_msg = 0;
enum insmod_return failed;
- if (IS_AUTOMATIC) {
- wait_message("Loading driver for SCSI adapter:\n \n%s", description);
- wait_msg = 1;
- } else
- stg1_info_message("About to load driver for SCSI adapter:\n \n%s", description);
+ wait_message("Loading driver for SCSI adapter:\n \n%s", description);
failed = my_insmod(driver, SCSI_ADAPTERS, NULL, 1);
- if (wait_msg)
- remove_wait_message();
+ remove_wait_message();
warning_insmod_failed(failed);
}
#endif
#ifndef DISABLE_NETWORK
if (type == NETWORK_DEVICES) {
- stg1_info_message("About to load driver for network device:\n \n%s", description);
+ wait_message("Loading driver for network device:\n \n%s", description);
prepare_intf_descr(description);
warning_insmod_failed(my_insmod(driver, NETWORK_DEVICES, NULL, 1));
+ remove_wait_message();
if (intf_descr_for_discover) /* for modules providing more than one net intf */
net_discovered_interface(NULL);
}