diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-02-12 17:30:52 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-02-12 17:30:52 +0000 |
| commit | 0dbd7e3bba7f08093f9ebef8fce8dfc2908acd66 (patch) | |
| tree | 344588616cdc874e12a6afab660274e3e721b678 /perl-install | |
| parent | 43f6ea1bb66049fc06ec8aa4423f26d8b5c6a890 (diff) | |
| download | drakx-0dbd7e3bba7f08093f9ebef8fce8dfc2908acd66.tar drakx-0dbd7e3bba7f08093f9ebef8fce8dfc2908acd66.tar.gz drakx-0dbd7e3bba7f08093f9ebef8fce8dfc2908acd66.tar.bz2 drakx-0dbd7e3bba7f08093f9ebef8fce8dfc2908acd66.tar.xz drakx-0dbd7e3bba7f08093f9ebef8fce8dfc2908acd66.zip | |
load disk/ide before disk/scsi (to prevent sata deps from overriding non-libata pata modules)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8e904faad..5ea843a51 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +- load disk/ide before disk/scsi, or else sata_sis may be loaded for a + SATA controller and trigger pata_sis loading before sis5513 is loaded, + which would defeat an eventual alias to sis5513 for a PATA controller + Version 10.6.19 - 12 February 2008 - do not propose "KDE, GNOME or Custom" profiles if the partition is small diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index c5715e2ef..4927d3c2c 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -161,7 +161,9 @@ sub setupSCSI { install::any::configure_pcmcia($o); modules::load(modules::category2modules('disk/cdrom')); modules::load_category($o->{modules_conf}, 'bus/firewire'); - modules::load_category($o->{modules_conf}, 'disk/ide|scsi|hardware_raid|sata|firewire'); + modules::load_category($o->{modules_conf}, 'disk/ide'); + #- load disk/ide before disk/scsi (to prevent sata deps from overriding non-libata pata modules) + modules::load_category($o->{modules_conf}, 'disk/scsi|hardware_raid|sata|firewire'); install::any::getHds($o); } |