diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2011-01-19 16:36:45 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2011-01-19 16:36:45 +0000 |
| commit | 45aff976bd9c02036a1188bfe330b07f2e5b0f7a (patch) | |
| tree | d77be02d07ab9c051c70d7bc79e2dac3c81b62eb | |
| parent | d537f12b889835df055a2053e37686b77545834d (diff) | |
| download | drakx-backup-do-not-use-45aff976bd9c02036a1188bfe330b07f2e5b0f7a.tar drakx-backup-do-not-use-45aff976bd9c02036a1188bfe330b07f2e5b0f7a.tar.gz drakx-backup-do-not-use-45aff976bd9c02036a1188bfe330b07f2e5b0f7a.tar.bz2 drakx-backup-do-not-use-45aff976bd9c02036a1188bfe330b07f2e5b0f7a.tar.xz drakx-backup-do-not-use-45aff976bd9c02036a1188bfe330b07f2e5b0f7a.zip | |
use init_firmware_loader(), add handle_hid
| -rw-r--r-- | mdk-stage1/stage1.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 80961d426..73f3fc4db 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -34,6 +34,8 @@ #include <stdarg.h> #include <signal.h> #include <linux/unistd.h> +#include <libldetect.h> + #include "stage1.h" @@ -242,11 +244,23 @@ static void handle_pcmcia(void) } #endif +#ifndef ENABLE_NETWORK_STANDALONE +static void handle_hid(void) +{ + struct hid_entries entry_list; + unsigned int i; + + entry_list = hid_probe(); + for (i = 0; i < entry_list.nb; i++) { + if (entry_list.entries[i].module != NULL) + my_insmod(entry_list.entries[i].module, ANY_DRIVER_TYPE, NULL, 0); + } +} + /************************************************************ */ -#ifndef ENABLE_NETWORK_STANDALONE static void method_select_and_prepare(void) { enum return_type results; @@ -410,7 +424,7 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) spawn_shell(); #endif init_modules_insmoding(); -// init_firmware_timeout(); + init_firmware_loader(); init_frontend("Welcome to " DISTRIB_DESCR ", " __DATE__ " " __TIME__); probe_that_type(VIRTIO_DEVICES, BUS_ANY); @@ -425,6 +439,7 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) if (!IS_NOAUTO) handle_pcmcia(); #endif + handle_hid(); if (IS_CHANGEDISK) stg1_info_message("You are starting the installation with an alternate booting method. " |