summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/modules.pm1
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);