- no ide-scsi emulation for ide ZIPs

- no ide-scsi emulation for cd burners when kernel 2.6

2 files changed, 8 insertions, 4 deletions

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index ffd7626bf..283782bb0 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -50,11 +50,13 @@ sub zips()        {
     } raw_zips();
 }
 
+sub faking_ide_scsi() { !$::isStandalone && !$::move && c::kernel_version() =~ /^\Q2.4/ }
+
 sub cdroms__faking_ide_scsi() { grep { $_->{media_type} eq 'cdrom' } cdroms_and_zips__faking_ide_scsi() }
 sub cdroms_and_zips__faking_ide_scsi() {
-    my @l = grep { $_->{media_type} eq 'cdrom' || member($_->{media_type}, 'fd', 'hd') && isZipDrive($_) } get();
+    my @l = grep { $_->{media_type} eq 'cdrom' } get();
 
-    if (my @l_need_fake = grep { !$::isStandalone && !$::move && $_->{bus} eq 'ide' && !($_->{media_type} eq 'cdrom' && !isBurner($_)) } @l) {
+    if (my @l_need_fake = grep { faking_ide_scsi() && $_->{bus} eq 'ide' && !($_->{media_type} eq 'cdrom' && !isBurner($_)) } @l) {
 	require modules;
 	modules::add_probeall('scsi_hostadapter', 'ide-scsi');
 
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index f89b82f47..8a9b017c6 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -806,8 +806,10 @@ sub setupBootloaderBefore {
     my ($o) = @_;
 
     require bootloader;
-    if (my @l = (grep { $_->{bus} eq 'ide' } detect_devices::burners(), detect_devices::raw_zips())) {
-	bootloader::set_append($o->{bootloader}, $_->{device}, 'ide-scsi') foreach @l;
+    if (detect_devices::faking_ide_scsi()) {
+	if (my @l = (grep { $_->{bus} eq 'ide' } detect_devices::burners())) {
+	    bootloader::set_append($o->{bootloader}, $_->{device}, 'ide-scsi') foreach @l;
+	}
     }
     if ($o->{miscellaneous}{HDPARM}) {
 	bootloader::set_append($o->{bootloader}, $_, 'autotune') foreach grep { /ide/ } all("/proc/ide");