diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-06-12 14:23:47 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-06-12 14:23:47 +0000 |
| commit | f6df534562236c0ec936dc5e192cdee06f0460a2 (patch) | |
| tree | a4da50604ebe046590a381a4cb1f6a78569f9fcf | |
| parent | 05ad5ca30de1c4e585f16ae1b548681b3f934c69 (diff) | |
| download | drakx-f6df534562236c0ec936dc5e192cdee06f0460a2.tar drakx-f6df534562236c0ec936dc5e192cdee06f0460a2.tar.gz drakx-f6df534562236c0ec936dc5e192cdee06f0460a2.tar.bz2 drakx-f6df534562236c0ec936dc5e192cdee06f0460a2.tar.xz drakx-f6df534562236c0ec936dc5e192cdee06f0460a2.zip | |
handle ide-cd being renamed as ide-cd_mod
| -rw-r--r-- | mdk-stage1/NEWS | 1 | ||||
| -rw-r--r-- | mdk-stage1/cdrom.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/tools.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index bd66abf57..435318a9d 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,6 +1,7 @@ - add back "ide-generic" support (incorrectly removed in 1.17), the module that we want to avoid is "ide-pci-generic" (previously "generic"), and this is handled by ldetect-lst preferred modules list +- handle ide-cd being renamed as ide-cd_mod 1.29: - allow to pass module options to probe-modules diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c index 8b3cb670e..f87307499 100644 --- a/mdk-stage1/cdrom.c +++ b/mdk-stage1/cdrom.c @@ -138,7 +138,7 @@ enum return_type cdrom_prepare(void) enum return_type results; static int already_probed_ide_generic = 0; - my_insmod("ide_cd", ANY_DRIVER_TYPE, NULL, 0); + my_insmod("ide_cd_mod", ANY_DRIVER_TYPE, NULL, 0); if (IS_AUTOMATIC) { get_medias(CDROM, &medias, &medias_models, BUS_IDE); diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c index 6a024eedd..ff19063f1 100644 --- a/mdk-stage1/tools.c +++ b/mdk-stage1/tools.c @@ -312,7 +312,7 @@ int get_cdroms(char *** names, char *** models) char ** ptr; int count = 0; - my_insmod("ide_cd", ANY_DRIVER_TYPE, NULL, 0); + my_insmod("ide_cd_mod", ANY_DRIVER_TYPE, NULL, 0); my_insmod("sr_mod", ANY_DRIVER_TYPE, NULL, 0); get_medias(CDROM, names, models, BUS_ANY); |