diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2004-01-22 17:09:00 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2004-01-22 17:09:00 +0000 |
| commit | 147317297c20ab596f239c8f3947ed3e2290282e (patch) | |
| tree | 6e2a3d285addc44365d79ee305a8677bebabab7a /mdk-stage1/stage1.c | |
| parent | ea1ae4d01e69b2bd24896315c88eb072c3874e1d (diff) | |
| download | drakx-backup-do-not-use-147317297c20ab596f239c8f3947ed3e2290282e.tar drakx-backup-do-not-use-147317297c20ab596f239c8f3947ed3e2290282e.tar.gz drakx-backup-do-not-use-147317297c20ab596f239c8f3947ed3e2290282e.tar.bz2 drakx-backup-do-not-use-147317297c20ab596f239c8f3947ed3e2290282e.tar.xz drakx-backup-do-not-use-147317297c20ab596f239c8f3947ed3e2290282e.zip | |
until we haven't loaded the usb interface and the keyboard usb driver, we can't allow asking for additional drivers floppy, so need another parameter to my_insmod to indicate in which situation we are
Diffstat (limited to 'mdk-stage1/stage1.c')
| -rw-r--r-- | mdk-stage1/stage1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 28b266ed8..2e1cb0972 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -230,7 +230,7 @@ static void expert_third_party_modules(void) if (results != RETURN_OK) return; - my_insmod("floppy", ANY_DRIVER_TYPE, NULL); + my_insmod("floppy", ANY_DRIVER_TYPE, NULL, 0); if (my_mount("/dev/fd0", floppy_mount_location, "ext2", 0) == -1) { stg1_error_message("I can't find a Linux ext2 floppy in first floppy drive."); @@ -284,9 +284,9 @@ static void handle_pcmcia(char ** pcmcia_adapter) log_message("no pcmcia adapter found"); return; } - my_insmod("pcmcia_core", ANY_DRIVER_TYPE, NULL); - my_insmod(*pcmcia_adapter, ANY_DRIVER_TYPE, NULL); - my_insmod("ds", ANY_DRIVER_TYPE, NULL); + my_insmod("pcmcia_core", ANY_DRIVER_TYPE, NULL, 0); + my_insmod(*pcmcia_adapter, ANY_DRIVER_TYPE, NULL, 0); + my_insmod("ds", ANY_DRIVER_TYPE, NULL, 0); /* call to cardmgr takes time, let's use the wait message */ wait_message("Enabling PCMCIA extension cards..."); @@ -463,7 +463,7 @@ int mandrake_move_post(void) fclose(f); // in case we didn't mount any clp, because gzloop.o is not available later in /lib/modules - my_insmod("gzloop", ANY_DRIVER_TYPE, NULL); + my_insmod("gzloop", ANY_DRIVER_TYPE, NULL, 0); // hardcoded :( if (!access(TOTEM_LOCATION, R_OK)) { |