diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-03-18 16:58:40 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-03-18 16:58:40 +0000 |
| commit | 07360c5bfa15ab267f71c282053e9e511310e0e2 (patch) | |
| tree | 8f29550b83d4c5922b5dc74f31e1b4c16f612d5f | |
| parent | 583f4b5202436f566c5fa22ef8f83386175003b9 (diff) | |
| download | drakx-07360c5bfa15ab267f71c282053e9e511310e0e2.tar drakx-07360c5bfa15ab267f71c282053e9e511310e0e2.tar.gz drakx-07360c5bfa15ab267f71c282053e9e511310e0e2.tar.bz2 drakx-07360c5bfa15ab267f71c282053e9e511310e0e2.tar.xz drakx-07360c5bfa15ab267f71c282053e9e511310e0e2.zip | |
load disk/ide before disk/scsi (to prevent sata deps from overriding non-libata pata modules, like in install::steps)
| -rwxr-xr-x | mdk-stage1/pci-resource/update-pci-ids.pl | 3 | ||||
| -rw-r--r-- | mdk-stage1/probing.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mdk-stage1/pci-resource/update-pci-ids.pl b/mdk-stage1/pci-resource/update-pci-ids.pl index 118cfb31d..05a5a5df0 100755 --- a/mdk-stage1/pci-resource/update-pci-ids.pl +++ b/mdk-stage1/pci-resource/update-pci-ids.pl @@ -7,7 +7,8 @@ use MDK::Common; my %t = ( network => 'network/main|gigabit|tokenring|wireless|pcmcia', - medias => 'disk/ide|scsi|hardware_raid|sata', + medias_ide => 'disk/ide', + medias_other => 'disk/scsi|hardware_raid|sata', ); foreach my $type (keys %t) { diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 729ad0b16..8da6fada8 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -202,7 +202,9 @@ void probing_detect_devices() struct pciusb_entry *e = &entries.entries[i]; #ifndef DISABLE_PCIADAPTERS #ifndef DISABLE_MEDIAS - if (add_detected_device_if_match(e, medias_pci_modules, medias_pci_modules_len)) + if (add_detected_device_if_match(e, medias_ide_pci_modules, medias_ide_pci_modules_len)) + continue; + if (add_detected_device_if_match(e, medias_other_pci_modules, medias_other_pci_modules_len)) continue; #endif @@ -328,7 +330,8 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u if (already_probed_media_adapters) break; already_probed_media_adapters = 1; - probe_pci_modules(type, medias_pci_modules, medias_pci_modules_len); + probe_pci_modules(type, medias_ide_pci_modules, medias_ide_pci_modules_len); + probe_pci_modules(type, medias_other_pci_modules, medias_other_pci_modules_len); break; #endif #ifndef DISABLE_NETWORK |