summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-02-13 20:04:27 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-02-13 20:04:27 +0000
commit6a8efaf86001393b62802af5b07f777f425f0fb9 (patch)
treee819decc382f921dc2bd22a532795b53aef799ae
parentb65931ccae1107a6dc4e6fd0049bb490168c2913 (diff)
downloaddrakx-6a8efaf86001393b62802af5b07f777f425f0fb9.tar
drakx-6a8efaf86001393b62802af5b07f777f425f0fb9.tar.gz
drakx-6a8efaf86001393b62802af5b07f777f425f0fb9.tar.bz2
drakx-6a8efaf86001393b62802af5b07f777f425f0fb9.tar.xz
drakx-6a8efaf86001393b62802af5b07f777f425f0fb9.zip
ask for modules parameters everytime in expert mode, to avoid wrong autodetections in certain cases
-rw-r--r--mdk-stage1/modules.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index 8194a7576..1b85fa7c8 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -307,7 +307,7 @@ static enum return_type insmod_with_options(char * mod, enum driver_type type)
enum return_type results;
char options[500] = "options ";
- results = ask_from_entries("Please enter the parameters to give to the kernel:", questions, &answers, 24);
+ results = ask_from_entries("Please enter the parameters to give to the kernel:", questions, &answers, 24, NULL);
if (results != RETURN_OK)
return results;
@@ -350,16 +350,7 @@ enum return_type ask_insmod(enum driver_type type)
if (results == RETURN_OK) {
choice[strlen(choice)-2] = '\0'; /* remove trailing .o */
- if (my_insmod(choice, type, NULL)) {
- enum return_type results;
- unset_param(MODE_AUTOMATIC); /* we are in a fallback mode */
-
- results = ask_yes_no("Insmod failed.\nTry with parameters?");
- if (results == RETURN_OK)
- return insmod_with_options(choice, type);
- return RETURN_ERROR;
- } else
- return RETURN_OK;
+ return insmod_with_options(choice, type);
} else
return results;
}