diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-02-27 22:41:05 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-02-27 22:41:05 +0000 |
| commit | d8d60e3fe9a43e3edd41658ab1332da82b7aee01 (patch) | |
| tree | c4776e7957e800f9907412fce38daf99e564047e | |
| parent | 6c58a9fd80d09807aacefba9f0ae6045be03be7b (diff) | |
| download | drakx-d8d60e3fe9a43e3edd41658ab1332da82b7aee01.tar drakx-d8d60e3fe9a43e3edd41658ab1332da82b7aee01.tar.gz drakx-d8d60e3fe9a43e3edd41658ab1332da82b7aee01.tar.bz2 drakx-d8d60e3fe9a43e3edd41658ab1332da82b7aee01.tar.xz drakx-d8d60e3fe9a43e3edd41658ab1332da82b7aee01.zip | |
fix automatic IDE media detection (was broken with multiple CD drives, #36161)
This is fixed by also loading media adapters for IDE bus, it was
probably broken when we switched to modular IDE in the kernel.
This should also allow keeping the bootsplash during stage2 load
(previously automatic IDE mode was not working in the "automatic" code
path, but working only if one IDE drives was present, after having
disabled automatic mode...)
| -rw-r--r-- | mdk-stage1/probing.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 16b52fabb..033fb44bc 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -512,10 +512,9 @@ void find_media(enum media_bus bus) if (medias) free(medias); /* that does not free the strings, by the way */ - if (bus == BUS_SCSI || bus == BUS_USB || bus == BUS_PCMCIA || bus == BUS_ANY) { - log_message("looking for media adapters"); - probe_that_type(SCSI_ADAPTERS, bus); - } + log_message("looking for media adapters"); + probe_that_type(MEDIA_ADAPTERS, bus); + /* ----------------------------------------------- */ if (bus != BUS_IDE && bus != BUS_ANY) goto find_media_after_ide; |