summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-07-28 08:34:05 +0000
committerOlivier Blin <oblin@mandriva.org>2004-07-28 08:34:05 +0000
commite400e529abf43994188100781722ed82d199f29a (patch)
treeb81fdaa8411ff395f51341dbaf64f6324e38e2e5
parentb03c2c31b637587f40066fe4bb2eaa189c437679 (diff)
downloaddrakx-e400e529abf43994188100781722ed82d199f29a.tar
drakx-e400e529abf43994188100781722ed82d199f29a.tar.gz
drakx-e400e529abf43994188100781722ed82d199f29a.tar.bz2
drakx-e400e529abf43994188100781722ed82d199f29a.tar.xz
drakx-e400e529abf43994188100781722ed82d199f29a.zip
do not probe usb interface too soon, wait for the Move images to be mounted
(or else usb drivers won't be automatically loaded at boot with Move)
-rw-r--r--mdk-stage1/stage1.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 64ec06334..458270227 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -588,6 +588,12 @@ 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)
@@ -630,9 +636,6 @@ 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.");