diff options
Diffstat (limited to 'perl-install/modules.pm')
| -rw-r--r-- | perl-install/modules.pm | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 1ca95c2dc..abeb0b366 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -1,4 +1,4 @@ -package modules; # $Id: modules.pm 269880 2010-06-04 14:01:44Z pterjan $ +package modules; use strict; @@ -59,9 +59,9 @@ sub module_is_available { #-############################################################################### #- module loading #-############################################################################### -# handles dependencies -sub load_raw { - my ($lm, $h_options) = @_; + +sub filter_loaded_modules { + my ($lm) = @_; my $l; @@ -87,6 +87,14 @@ sub load_raw { push @$l, $mod; } } + $l; +} + +# handles dependencies +sub load_raw { + my ($lm, $h_options) = @_; + + my $l = filter_loaded_modules($lm); if ($::testing || $::local_install) { log::l("i would load module $_ ($h_options->{$_})") foreach @$l; @@ -157,13 +165,6 @@ sub load_category { if_($category =~ /scsi/, if_(detect_devices::usbStorage(), 'usb_storage'), ), - arch() =~ /ppc/ ? ( - if_($category =~ /scsi/, - if_(detect_devices::has_mesh(), 'mesh'), - if_(detect_devices::has_53c94(), 'mac53c94'), - ), - if_($category =~ /net/, 'bmac', 'gmac', 'mace', 'airport'), - ) : (), ); my @l = ( (map { @@ -188,8 +189,6 @@ sub load_category { sub load_parallel_zip { my ($conf) = @_; - arch() !~ /ppc/ or return; - grep { eval { load_and_configure($conf, $_); 1 }; } @parallel_zip_modules; @@ -277,11 +276,6 @@ sub when_load_category { eval { load('ide_gd_mod') }; } elsif ($category =~ m,disk/(scsi|hardware_raid|sata|firewire|virtual),) { $conf->add_probeall('scsi_hostadapter', $name); - if (detect_devices::isHyperv()) { - log::l("HyperV detected. Loading storvsc"); - load('hv_vmbus'); - load('hv_storvsc'); - } eval { load('sd_mod') }; } elsif ($category eq 'bus/usb') { $conf->add_probeall('usb-interface', $name); |