diff options
author | Guillaume Cottenceau <gc@mandriva.com> | 2002-07-24 14:05:11 +0000 |
---|---|---|
committer | Guillaume Cottenceau <gc@mandriva.com> | 2002-07-24 14:05:11 +0000 |
commit | 59255c556db6a1fbb94458d87f798a58d39a056f (patch) | |
tree | f4615fc18a1373a7dbcee6d3c0055a3221c3025f /mdk-stage1/stdio-frontend.c | |
parent | 84d0ecb2c7f8a0191118b8f14140a209b660ccbd (diff) | |
download | drakx-59255c556db6a1fbb94458d87f798a58d39a056f.tar drakx-59255c556db6a1fbb94458d87f798a58d39a056f.tar.gz drakx-59255c556db6a1fbb94458d87f798a58d39a056f.tar.bz2 drakx-59255c556db6a1fbb94458d87f798a58d39a056f.tar.xz drakx-59255c556db6a1fbb94458d87f798a58d39a056f.zip |
enhance (complicate? ;p) device detection so that scsi and usb
detection are done only when no ide cdrom with mandrake install
is detected (speed up), have usb keyboard modules installed
before any interactive question, honour "noauto" (skip usb
detection and insmod'ing)
Diffstat (limited to 'mdk-stage1/stdio-frontend.c')
-rw-r--r-- | mdk-stage1/stdio-frontend.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mdk-stage1/stdio-frontend.c b/mdk-stage1/stdio-frontend.c index 83e8fd76d..3fbed999a 100644 --- a/mdk-stage1/stdio-frontend.c +++ b/mdk-stage1/stdio-frontend.c @@ -27,6 +27,8 @@ #include <sys/ioctl.h> #include <termios.h> +#include <probing.h> + #include "frontend.h" @@ -249,6 +251,8 @@ enum return_type ask_from_list_comments(char *msg, char ** elems, char ** elems_ int i = 1; int j = 0; + probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so... + while (elems && *elems) { elems++; i++; @@ -303,6 +307,7 @@ enum return_type ask_from_list_comments(char *msg, char ** elems, char ** elems_ enum return_type ask_from_list(char *msg, char ** elems, char ** choice) { + probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so... return ask_from_list_comments(msg, elems, NULL, choice); } @@ -311,6 +316,8 @@ enum return_type ask_yes_no(char *msg) { int j; + probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so... + printf("> %s\n[0] Yes [1] No [2] Back\n? ", msg); j = get_int_response(); @@ -328,6 +335,8 @@ enum return_type ask_from_entries(char *msg, char ** questions, char *** answers int j, i = 0; char ** already_answers = NULL; + probe_that_type(USB_CONTROLLERS, BUS_USB); // we'd need the keyboard for interactions so... + printf("> %s\n", msg); while (questions && *questions) { |