diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-09-19 19:59:00 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-09-19 19:59:00 +0000 |
| commit | 34b77adc79623306b231906f040646400ad50107 (patch) | |
| tree | c8ebc600ce830e5035035561e7e6cf10c91d5ced | |
| parent | c97d991f941cb6fc8b5a9aea60f6e549db3fee5f (diff) | |
| download | drakx-34b77adc79623306b231906f040646400ad50107.tar drakx-34b77adc79623306b231906f040646400ad50107.tar.gz drakx-34b77adc79623306b231906f040646400ad50107.tar.bz2 drakx-34b77adc79623306b231906f040646400ad50107.tar.xz drakx-34b77adc79623306b231906f040646400ad50107.zip | |
drop sr_mod workarounds, it's now handled by udev coldplug
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index c118324b4..41ae7181f 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -283,8 +283,6 @@ sub getSCSI_26() { # (see linux/include/scsi/scsi.h and sans-find-scanner.1) my $raw_type = $scsi_types[$get->('type')]; $media_type ||= 'scanner' if $raw_type =~ /Scanner|Processor/; - # if sr_mod isn't loaded, the block device may not be created yet - $media_type ||= 'cdrom' if $raw_type eq "CD-ROM"; { info => $get->('vendor') . ' ' . $get->('model'), host => $host, channel => $channel, id => $id, lun => $lun, bus => 'SCSI', media_type => $media_type, device => $device, diff --git a/perl-install/modules.pm b/perl-install/modules.pm index e34f16fd1..6a9595d8e 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -212,7 +212,6 @@ sub write_preload_conf { push @l, map { $_->{driver} } probe_category($_) foreach qw(multimedia/dvb multimedia/tv various/laptop input/joystick various/crypto); push @l, 'padlock' if cat_("/proc/cpuinfo") =~ /rng_en/; push @l, 'evdev' if detect_devices::getSynapticsTouchpads(); - push @l, 'sr_mod' if any { $_->{media_type} eq 'cdrom' } detect_devices::getSCSI(); my @l_26 = @l; push @l_26, map { $_->{driver} } probe_category('various/agpgart'); append_to_modules_loaded_at_startup("$::prefix/etc/modules", @l); |