summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-07-30 04:39:22 +0000
committerOlivier Blin <oblin@mandriva.org>2004-07-30 04:39:22 +0000
commitac2e0129626796ca73b8abcb86d8a2a585919a82 (patch)
treefca9248646c15d299fc441365f16b105228e7cca
parent4408db6df6b494b1e20028347794f9eb3a879012 (diff)
downloaddrakx-ac2e0129626796ca73b8abcb86d8a2a585919a82.tar
drakx-ac2e0129626796ca73b8abcb86d8a2a585919a82.tar.gz
drakx-ac2e0129626796ca73b8abcb86d8a2a585919a82.tar.bz2
drakx-ac2e0129626796ca73b8abcb86d8a2a585919a82.tar.xz
drakx-ac2e0129626796ca73b8abcb86d8a2a585919a82.zip
revert previous commit, that won't work after pivot_root (proc has to
be mounted, insmod would have to be able to find the modules in the new root)
-rw-r--r--mdk-stage1/stage1.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 458270227..57477d198 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -588,12 +588,6 @@ void finish_preparing(void)
write(fd, "Killed\n", 7);
close(fd);
}
-
- /* load usb interface as soon as possible, helps usb mouse detection in stage2
- * (blino) do not probe it so soon, wait for the Move images to be mounted
- * or else usb drivers won't be automatically loaded at boot with Move
- */
- probe_that_type(USB_CONTROLLERS, BUS_USB);
}
int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)), char **env)
@@ -636,6 +630,9 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
handle_pcmcia();
#endif
+ /* load usb interface as soon as possible, helps usb mouse detection in stage2 */
+ probe_that_type(USB_CONTROLLERS, BUS_USB);
+
if (IS_CHANGEDISK)
stg1_info_message("You are starting the installation with an alternate booting method. "
"Please change your disk, and insert the Installation disk.");