diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-02-13 16:13:03 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-02-13 16:13:03 +0000 |
| commit | f9d539b8d50b5608e6e02e1ea7b613bb487d1043 (patch) | |
| tree | d814544729758a23bec1c3528ea8de19a30e8a41 /perl-install/modules.pm | |
| parent | 762cb4be621d9db7c51dee6bace5553decd32282 (diff) | |
| download | drakx-backup-do-not-use-f9d539b8d50b5608e6e02e1ea7b613bb487d1043.tar drakx-backup-do-not-use-f9d539b8d50b5608e6e02e1ea7b613bb487d1043.tar.gz drakx-backup-do-not-use-f9d539b8d50b5608e6e02e1ea7b613bb487d1043.tar.bz2 drakx-backup-do-not-use-f9d539b8d50b5608e6e02e1ea7b613bb487d1043.tar.xz drakx-backup-do-not-use-f9d539b8d50b5608e6e02e1ea7b613bb487d1043.zip | |
- have usb-storage as a scsi_hostadapter by default
- remove it if unneeded for normal boot (cf comment in the code)
Diffstat (limited to 'perl-install/modules.pm')
| -rw-r--r-- | perl-install/modules.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 952a5d375..52df91fad 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -189,6 +189,13 @@ sub add_probeall { @$l = uniq(@$l, $module); log::l("setting probeall $alias to @$l"); } +sub remove_probeall { + my ($alias, $module) = @_; + + my $l = $conf{$alias}{probeall} ||= []; + @$l = grep { $_ ne $module } @$l; + log::l("setting probeall $alias to @$l"); +} sub remove_alias($) { my ($name) = @_; @@ -409,7 +416,7 @@ sub when_load { if (my $category = module2category($name)) { if ($category =~ m,disk/(scsi|hardware_raid|usb|firewire),) { - add_probeall('scsi_hostadapter', $name) if $name ne 'usb-storage'; + add_probeall('scsi_hostadapter', $name); eval { load('sd_mod') }; } add_alias('sound-slot-0', $name) if $category =~ /sound/; |