summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/stage1.c
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-07-28 08:57:04 +0000
committerOlivier Blin <oblin@mandriva.org>2004-07-28 08:57:04 +0000
commitda1e8b82aaba9500d972fb0efb731b45a70b2bf6 (patch)
treecbc627adcd2a522817ab41826f54d18df2391194 /mdk-stage1/stage1.c
parentec797f5da72720ec6e47fa4e266883bbe6902ac0 (diff)
downloaddrakx-backup-do-not-use-da1e8b82aaba9500d972fb0efb731b45a70b2bf6.tar
drakx-backup-do-not-use-da1e8b82aaba9500d972fb0efb731b45a70b2bf6.tar.gz
drakx-backup-do-not-use-da1e8b82aaba9500d972fb0efb731b45a70b2bf6.tar.bz2
drakx-backup-do-not-use-da1e8b82aaba9500d972fb0efb731b45a70b2bf6.tar.xz
drakx-backup-do-not-use-da1e8b82aaba9500d972fb0efb731b45a70b2bf6.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)
Diffstat (limited to 'mdk-stage1/stage1.c')
-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 84f596b1c..ecfa7b533 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -582,9 +582,6 @@ 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.");
@@ -624,6 +621,12 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
stg1_error_message("Fatal error when launching Mandrakemove.");
#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);