diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-09-26 09:31:57 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-09-26 09:31:57 +0000 |
| commit | 832ba3936e688635bfbbdada9b07e30f2b0eb827 (patch) | |
| tree | 87c53c824da81571892550cc9be2862e27981df1 | |
| parent | 5f6c3435118f551f246889de4a1f7bf86db78bcc (diff) | |
| download | drakx-832ba3936e688635bfbbdada9b07e30f2b0eb827.tar drakx-832ba3936e688635bfbbdada9b07e30f2b0eb827.tar.gz drakx-832ba3936e688635bfbbdada9b07e30f2b0eb827.tar.bz2 drakx-832ba3936e688635bfbbdada9b07e30f2b0eb827.tar.xz drakx-832ba3936e688635bfbbdada9b07e30f2b0eb827.zip | |
- never add usb-storage to scsi_hostadapter
(never needed, and when wrongly added, it slows the boot)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 514058794..790735dc8 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- never add usb-storage to scsi_hostadapter + (never needed, and when wrongly added, it slows the boot) - ensure DPMS screensaver is not triggered during install (it interacts badly with matchbox/compositing) (#44021) - generate /root/drakx/package_list.pl at end of install diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 74fe8707d..af6a10aa3 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -258,7 +258,7 @@ sub when_load_category { if ($category =~ m,disk/ide,) { $conf->add_probeall('ide-controller', $name); eval { load('ide_disk') }; - } elsif ($category =~ m,disk/(scsi|hardware_raid|sata|usb|firewire),) { + } elsif ($category =~ m,disk/(scsi|hardware_raid|sata|firewire),) { $conf->add_probeall('scsi_hostadapter', $name); eval { load('sd_mod') }; } elsif ($category eq 'bus/usb') { |