summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/stage1.c
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-07-30 04:44:42 +0000
committerOlivier Blin <oblin@mandriva.org>2004-07-30 04:44:42 +0000
commit885bfc96b54172cbe627cfd154561db21c457d8c (patch)
tree4241995d2aea061b33f70ebd43c401a2cd6bddcd /mdk-stage1/stage1.c
parent94a9aa6b6be9af54402364b4309e4136866537ad (diff)
downloaddrakx-885bfc96b54172cbe627cfd154561db21c457d8c.tar
drakx-885bfc96b54172cbe627cfd154561db21c457d8c.tar.gz
drakx-885bfc96b54172cbe627cfd154561db21c457d8c.tar.bz2
drakx-885bfc96b54172cbe627cfd154561db21c457d8c.tar.xz
drakx-885bfc96b54172cbe627cfd154561db21c457d8c.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), we'll have to use hotplug to load eagle-usb drivers in Move (in next release maybe)
Diffstat (limited to 'mdk-stage1/stage1.c')
-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 f26df2c72..ccbf02646 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -583,6 +583,9 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
handle_pcmcia(&pcmcia_adapter);
#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.");
@@ -622,12 +625,6 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
stg1_error_message("Fatal error when launching Move.");
#endif
- /* 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);
-
if (shell_pid != 0) {
int fd;
kill(shell_pid, 9);