diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-07-10 12:51:40 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-07-10 12:51:40 +0000 |
| commit | 9bccc7c1f3b773f187376ffbdd04bccb6afe7753 (patch) | |
| tree | 496cab2774727959984fd2e1fac5e76e8b580b79 | |
| parent | aba784f91f52384e580ff85297ba7de2a85dafa4 (diff) | |
| download | drakx-9bccc7c1f3b773f187376ffbdd04bccb6afe7753.tar drakx-9bccc7c1f3b773f187376ffbdd04bccb6afe7753.tar.gz drakx-9bccc7c1f3b773f187376ffbdd04bccb6afe7753.tar.bz2 drakx-9bccc7c1f3b773f187376ffbdd04bccb6afe7753.tar.xz drakx-9bccc7c1f3b773f187376ffbdd04bccb6afe7753.zip | |
- load disk/scsi before disk/ide since libata is now the default
(to prevent modules::load_category from loading ide-generic too early)
| -rw-r--r-- | perl-install/install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 6e362dab8..609eeb550 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- load disk/scsi before disk/ide since libata is now the default + (to prevent modules::load_category from loading ide-generic too early) + Version 10.46 - 10 July 2008 - authentication: diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index ac7566755..e5122e512 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -159,9 +159,10 @@ 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'); - #- 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'); + modules::load_category($o->{modules_conf}, 'disk/scsi'); + #- load disk/scsi before disk/ide since libata is now the default + #- (to prevent modules::load_category from loading ide-generic too early) + modules::load_category($o->{modules_conf}, 'disk/ide|hardware_raid|sata|firewire'); install::any::getHds($o); } |