diff options
| -rw-r--r-- | kernel/list_modules.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules/interactive.pm | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index 892fdbcd1..df21688a5 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -82,11 +82,12 @@ our %l = ( qw(qla1280 qla2x00 qlogicfas qlogicfc), qw(seagate wd7000 sim710 sym53c416 t128 tmscsim u14-34f ultrastor), qw(eata eata_pio eata_dma nsp32), - # SATA: - qw(ahci ata_piix sata_nv sata_promise sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc sx8), ), qw(aic7xxx aic7xxx_old aic79xx pci2000 qlogicisp sym53c8xx lpfc lpfcdd), # ncr53c8xx ], + sata => [ + qw(ahci ata_piix sata_nv sata_promise sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc sx8), + ], hardware_raid => [ if_(arch() =~ /^sparc/, qw(pluto)), if_(arch() !~ /alpha/ && arch() !~ /sparc/, diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 0f937461c..551e2abe6 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -158,7 +158,7 @@ sub setupSCSI { install_any::configure_pcmcia($o->{modules_conf}, $o->{pcmcia}) if $o->{pcmcia}; 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|firewire'); + modules::load_category($o->{modules_conf}, 'disk/ide|scsi|hardware_raid|sata|firewire'); install_any::getHds($o); } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 0420be586..e26e2538e 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -239,8 +239,8 @@ sub setupSCSI { modules::interactive::load_category($o, $o->{modules_conf}, 'bus/firewire', 1); my $have_non_scsi = detect_devices::hds(); #- at_least_one scsi device if we have no disks - modules::interactive::load_category($o, $o->{modules_conf}, 'disk/ide|scsi|hardware_raid|firewire', 1, !$have_non_scsi); - modules::interactive::load_category($o, $o->{modules_conf}, 'disk/ide|scsi|hardware_raid|firewire') if !detect_devices::hds(); #- we really want a disk! + modules::interactive::load_category($o, $o->{modules_conf}, 'disk/ide|scsi|hardware_raid|sata|firewire', 1, !$have_non_scsi); + modules::interactive::load_category($o, $o->{modules_conf}, 'disk/ide|scsi|hardware_raid|sata|firewire') if !detect_devices::hds(); #- we really want a disk! install_interactive::tellAboutProprietaryModules($o); diff --git a/perl-install/modules.pm b/perl-install/modules.pm index b92a2b5d0..bdfc36371 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -239,7 +239,7 @@ sub when_load { sub when_load_category { my ($conf, $name, $category) = @_; - if ($category =~ m,disk/(ide|scsi|hardware_raid|usb|firewire),) { + if ($category =~ m,disk/(ide|scsi|hardware_raid|sata|usb|firewire),) { $conf->add_probeall('scsi_hostadapter', $name); eval { load('sd_mod') }; } elsif ($category eq 'bus/usb') { diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm index 3c103266f..372b0dd5c 100644 --- a/perl-install/modules/interactive.pm +++ b/perl-install/modules/interactive.pm @@ -81,7 +81,7 @@ sub load_category__prompt_for_more { my %category2text = ( 'bus/usb' => N_("Installing driver for USB controller"), 'bus/firewire' => N_("Installing driver for firewire controller %s"), - 'disk/ide|scsi|hardware_raid|firewire' => N_("Installing driver for hard drive controller %s"), + 'disk/ide|scsi|hardware_raid|sata|firewire' => N_("Installing driver for hard drive controller %s"), list_modules::ethernet_categories() => N_("Installing driver for ethernet controller %s"), ); |